2 files changed, 7 insertions, 5 deletions

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index e91014021..0fff05a4e 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -46,8 +46,7 @@ lib_LTLIBRARIES = \
   libgnunetgns_common.la
 
 
-if HAVE_MHD
- DO_FCFSD=gnunet-gns-fcfsd
+#if HAVE_MHD
 if HAVE_GNUTLS
 if HAVE_LIBCURL
  DO_PROXY=gnunet-gns-proxy
@@ -56,7 +55,7 @@ endif
 endif
 
 libexec_PROGRAMS = \
-  gnunet-service-gns $(DO_FCFSD) \
+  gnunet-service-gns \
   $(DO_PROXY) \
   $(DO_W32_HELPER) \
   gnunet-dns2gns
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index b7ff99998..da833b4ba 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -92,9 +92,12 @@ libexec_PROGRAMS = \
  gnunet-service-namestore 
 
 bin_PROGRAMS = \
- gnunet-namestore \
- gnunet-namestore-fcfsd
+ gnunet-namestore 
 
+if HAVE_MHD
+bin_PROGRAMS += \
+ gnunet-namestore-fcfsd
+endif
 
 gnunet_namestore_SOURCES = \
  gnunet-namestore.c