diff --git a/mod/greeting/def.mk b/mod/greeting/def.mk
new file mode 100644
index 0000000..bd4a6cd
--- /dev/null
+++ b/mod/greeting/def.mk
@@ -0,0 +1,6 @@
+name := greeting
+lang := cpp
+type := lib
+
+header_list := greeting.hpp
+source_list := greeting.cpp
diff --git a/mod/greeting/include/greeting.hpp b/mod/greeting/include/greeting.hpp
new file mode 100644
index 0000000..c9d1a3d
--- /dev/null
+++ b/mod/greeting/include/greeting.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <string>
+
+namespace greeting {
+
+std::string make_greeting(std::string const& greetee);
+
+}
diff --git a/mod/greeting/source/greeting.cpp b/mod/greeting/source/greeting.cpp
new file mode 100644
index 0000000..0fb811d
--- /dev/null
+++ b/mod/greeting/source/greeting.cpp
@@ -0,0 +1,17 @@
+#include <greeting/greeting.hpp>
+
+#include <sstream>
+
+namespace greeting {
+
+std::string make_greeting(std::string const& greetee) {
+  if (greetee == "") {
+    return "Hello!";
+  } else {
+    std::ostringstream out;
+    out << "Hello " << greetee << "!";
+    return out.str();
+  }
+}
+
+}