diff --git a/.gitignore b/.gitignore
index c079b48..0021091 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 src/zzuf
-test/zzcat
+src/zzcat
 test/zzero
 test/zznop
 test/bug-div0
diff --git a/src/Makefile.am b/src/Makefile.am
index 59e8e6b..fbc738b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,14 @@
 # $Id$
 
-bin_PROGRAMS = zzuf
+bin_PROGRAMS = zzuf zzcat
 pkglib_LTLIBRARIES = libzzuf.la
 
 ZZUF = \
     zzuf.c opts.c opts.h md5.c md5.h timer.c timer.h myfork.c myfork.h
 
+ZZCAT = \
+    zzcat.c
+
 LIBZZUF = \
     libzzuf/libzzuf.c libzzuf/libzzuf.h \
     libzzuf/debug.c libzzuf/debug.h \
@@ -30,6 +33,8 @@ zzuf_CFLAGS = -DLIBDIR=\"$(libdir)/zzuf\" -I$(srcdir)/common
 zzuf_LDFLAGS = $(MATH_LIBS) $(WINSOCK2_LIBS)
 zzuf_DEPENDENCIES = libzzuf.la
 
+zzcat_SOURCES = $(ZZCAT) $(GETOPT)
+
 libzzuf_la_SOURCES = $(LIBZZUF) $(COMMON)
 libzzuf_la_CFLAGS = -DLIBZZUF -I$(srcdir)/libzzuf -I$(srcdir)/common
 libzzuf_la_LDFLAGS = -avoid-version -no-undefined $(DLL_LDFLAGS)
diff --git a/test/zzcat.c b/src/zzcat.c
similarity index 100%
rename from test/zzcat.c
rename to src/zzcat.c
diff --git a/test/Makefile.am b/test/Makefile.am
index 79c849b..013813e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,6 @@
 
 EXTRA_DIST = $(TESTS) functions.inc file-00 file-ff file-random file-text
 
-bin_PROGRAMS = zzcat
 noinst_PROGRAMS = zzero zznop bug-overflow bug-memory bug-div0
 
 TESTS = check-build check-md5 check-overflow check-memory check-div0 \
diff --git a/test/functions.inc b/test/functions.inc
index 5bd5883..b4dd453 100644
--- a/test/functions.inc
+++ b/test/functions.inc
@@ -4,7 +4,7 @@
 DIR="$(dirname "$0")"
 ZZUF="$DIR/../src/zzuf -E '[.]ilist$'"
 
-ZZCAT="$DIR/zzcat"
+ZZCAT="$DIR/../src/zzcat"
 if [ ! -f "$ZZCAT" ]; then
   echo "error: test/zzcat is missing"
   exit 1