diff --git a/Makefile.am b/Makefile.am
index 71db261..3d863ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # Generic definitions
-SUBDIRS = lib doc
+SUBDIRS = lib doc utils
 
 CLEANFILES=
 ACLOCAL_AMFLAGS =-I m4
@@ -33,16 +33,7 @@ iscsi_includedir = $(includedir)/iscsi
 dist_iscsi_include_HEADERS = include/iscsi.h include/scsi-lowlevel.h
 dist_noinst_HEADERS = include/iscsi-private.h include/md5.h include/slist.h
 
-# libiscsi utilities
-bin_PROGRAMS += bin/iscsi-inq bin/iscsi-ls bin/iscsi-readcapacity16 \
-	bin/iscsi-swp
-bin_iscsi_inq_SOURCES = src/iscsi-inq.c
-bin_iscsi_ls_SOURCES = src/iscsi-ls.c
-bin_iscsi_swp_SOURCES = src/iscsi-swp.c
-bin_iscsi_readcapacity16_SOURCES = src/iscsi-readcapacity16.c
-
 # Other examples
-
 noinst_PROGRAMS += bin/iscsiclient
 bin_iscsiclient_SOURCES = examples/iscsiclient.c
 
diff --git a/configure.ac b/configure.ac
index c02ed12..f8ff474 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,5 +131,6 @@ AC_CHECK_MEMBER([struct CU_SuiteInfo.pSetUpFunc],
 AC_CONFIG_FILES([Makefile]
 		[lib/Makefile]
 		[doc/Makefile]
+		[utils/Makefile]
 		[libiscsi.pc])
 AC_OUTPUT
diff --git a/utils/Makefile.am b/utils/Makefile.am
new file mode 100644
index 0000000..8a17f9f
--- /dev/null
+++ b/utils/Makefile.am
@@ -0,0 +1,8 @@
+AM_CPPFLAGS=-I../include "-D_U_=__attribute__((unused))" \
+	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
+AM_CFLAGS=$(WARN_CFLAGS)
+LDADD = ../lib/libiscsi.la
+
+bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-readcapacity16 \
+	iscsi-swp
+
diff --git a/src/iscsi-inq.c b/utils/iscsi-inq.c
similarity index 100%
rename from src/iscsi-inq.c
rename to utils/iscsi-inq.c
diff --git a/src/iscsi-ls.c b/utils/iscsi-ls.c
similarity index 100%
rename from src/iscsi-ls.c
rename to utils/iscsi-ls.c
diff --git a/src/iscsi-readcapacity16.c b/utils/iscsi-readcapacity16.c
similarity index 100%
rename from src/iscsi-readcapacity16.c
rename to utils/iscsi-readcapacity16.c
diff --git a/src/iscsi-swp.c b/utils/iscsi-swp.c
similarity index 100%
rename from src/iscsi-swp.c
rename to utils/iscsi-swp.c