--- a/apps/Makefile	Thu Apr 21 14:57:45 2011 +0100
+++ b/apps/Makefile	Tue Apr 26 14:43:43 2011 +0100
@@ -23,27 +23,29 @@
 SRCDIR := ..
 endif
 
-SINGLE_SOURCE_APPS := 			\
+SINGLE_SOURCE_APPS := 		\
 	dtncat/dtncat			\
-	dtncp/dtncp			\
+	dtncp/dtncp			    \
 	dtncpd/dtncpd			\
 	dtnping/dtnping			\
-	dtnping/dtntraceroute		\
+	dtnping/dtntraceroute	\
 	dtnping/dtnreporter		\
-	dtnperf/dtnperf-server		\
+	dtnperf/dtnperf-server	\
 	dtnrecv/dtnrecv			\
+    dtnquery/dtnquery       \
+    dtnrespond/dtnrespond   \
 	dtnsink/dtnsink			\
 	num2sdnv/num2sdnv		\
 
-OTHER_APPS :=				\
+OTHER_APPS :=				    \
 	dtnmoteproxy/dtnmoteproxy	\
-	dtntest/dtntest			\
-	dtntunnel/dtntunnel		\
+	dtntest/dtntest			    \
+	dtntunnel/dtntunnel		    \
 	dtnperf/dtnperf-client		\
-	tca_admin/tca_admin		\
-	dtnsend/dtnsend			\
-	dtnsource/dtnsource		\
-	num2sdnv/sdnv2num		\
+	tca_admin/tca_admin		    \
+	dtnsend/dtnsend			    \
+	dtnsource/dtnsource		    \
+	num2sdnv/sdnv2num		    \
 
 APPS := $(SINGLE_SOURCE_APPS) $(OTHER_APPS)