5 files changed, 17 insertions, 14 deletions

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 2a63b1f36..4c9d6f7c7 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -4,7 +4,7 @@ man_MANS = \
   gnunet-download.1 \
   gnunet-download-manager.1 \
   gnunet-fs.1 \
-  gnunet-gns.1 \
+  gnunet-namestore.1 \
   gnunet-nat-server.1 \
   gnunet-peerinfo.1 \
   gnunet-pseudonym.1 \
diff --git a/doc/man/gnunet-gns.1 b/doc/man/gnunet-namestore.1
index 8fd4b33e4..8fd4b33e4 100644
--- a/doc/man/gnunet-gns.1
+++ b/doc/man/gnunet-namestore.1
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 64484dbf3..bd3e81c04 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -20,8 +20,7 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
   gnunet-service-gns \
-  gnunet-gns-fcfsd \
-  gnunet-gns
+  gnunet-gns-fcfsd 
 
 #noinst_PROGRAMS = \
 #  gnunet-gns-lookup
@@ -124,16 +123,6 @@ gnunet_gns_fcfsd_DEPENDENCIES = \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
 
-gnunet_gns_SOURCES = \
- gnunet-gns.c 
-gnunet_gns_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(GN_LIBINTL)
-gnunet_gns_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
-
 libgnunetgns_la_SOURCES = \
  gns_api.c gns.h
 libgnunetgns_la_LIBADD = \
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index f937c502f..21c8166d0 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -55,7 +55,21 @@ libgnunetnamestore_la_LDFLAGS = \
   -version-info 0:0:0
 
 bin_PROGRAMS = \
- gnunet-service-namestore
+ gnunet-service-namestore \
+ gnunet-namestore
+
+
+gnunet_namestore_SOURCES = \
+ gnunet-namestore.c 
+gnunet_namestore_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetnamestore.la \
+  $(GN_LIBINTL)
+gnunet_namestore_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetnamestore.la
+
+
 
 gnunet_service_namestore_SOURCES = \
  gnunet-service-namestore.c
diff --git a/src/gns/gnunet-gns.c b/src/namestore/gnunet-namestore.c
index a6b45586b..a6b45586b 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/namestore/gnunet-namestore.c