diff --git a/configure.ac b/configure.ac
index 748e4122602a..4d79cc796d82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,6 +269,11 @@ then
         AC_DEFINE(HAVE_BOTAN18,1,[If we have botan 1.8])
 fi
 
+if test "x$enable_cryptopp" = "xyes"
+then
+        AC_DEFINE(HAVE_CRYPTOPP,1,[If we have cryptopp])
+fi
+
 AC_ARG_ENABLE(remotebackend_http, AC_HELP_STRING([--enable-remotebackend-http],[enable HTTP connector for remotebackend]),[enable_remotebackend_http=yes], [enable_remotebackend_http=no])
 AC_MSG_CHECKING(whether to enable http connector in remotebackend)
 AC_MSG_RESULT($enable_remotebackend_http)
@@ -327,6 +332,7 @@ AC_ARG_WITH(socketdir, AC_HELP_STRING([--with-socketdir],[where the controlsocke
 AC_SUBST(moduledirs)
 AC_SUBST(moduleobjects)
 AC_SUBST(modulelibs)
+AC_DEFINE_UNQUOTED(PDNS_MODULES,"$modules", [Built-in modules])
 
 AC_MSG_CHECKING(whether we will be building the server)
 AC_ARG_ENABLE(pdns-server,
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index f48900486680..146edecb6486 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2115,6 +2115,7 @@ int main(int argc, char **argv)
     }
     if(::arg().mustDo("version")) {
       showProductVersion();
+      showBuildConfiguration();
       exit(99);
     }
 
diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index b5cb44d65ae7..bc514a13ecf3 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -425,6 +425,7 @@ int main(int argc, char **argv)
     
     if(::arg().mustDo("version")) {
       showProductVersion();
+      showBuildConfiguration();
       exit(99);
     }
 
diff --git a/pdns/version.cc b/pdns/version.cc
index 3eceba95f599..8cb17a36b5d1 100644
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -46,6 +46,37 @@ void showProductVersion()
     "according to the terms of the GPL version 2." << endl;
 }
 
+void showBuildConfiguration()
+{
+  theL()<<Logger::Warning<<"Features: "<<
+#ifdef HAVE_BOTAN110
+    "botan1.10 " <<
+#endif
+#ifdef HAVE_BOTAN18
+    "botan1.8" <<
+#endif
+#ifdef HAVE_CRYPTOPP
+    "cryptopp " <<
+#endif
+#ifdef HAVE_LIBDL
+    "libdl " <<
+#endif
+#ifdef HAVE_LUA
+    "lua " <<
+#endif
+#ifdef REMOTEBACKEND_HTTP
+    "remotebackend-http" <<
+#endif
+#ifdef VERBOSELOG
+    "verboselog" <<
+#endif
+    endl;
+#ifdef PDNS_MODULES
+  // Auth only
+  theL()<<Logger::Warning<<"Built-in modules: "<<PDNS_MODULES<<endl;
+#endif
+}
+
 string fullVersionString()
 {
   ostringstream s;
diff --git a/pdns/version.hh b/pdns/version.hh
index 09058558da0f..7e8f3fac2875 100644
--- a/pdns/version.hh
+++ b/pdns/version.hh
@@ -22,6 +22,7 @@
 
 string compilerVersion();
 void showProductVersion();
+void showBuildConfiguration();
 string fullVersionString();
 void versionSetProduct(string product);