diff --git a/configure.in b/configure.in
index 4722c573..73cdf896 100644
--- a/configure.in
+++ b/configure.in
@@ -359,6 +359,9 @@ AC_CONFIG_FILES([ \
src/test_libFLAC++/Makefile \
src/test_seeking/Makefile \
src/test_streams/Makefile \
+ src/utils/Makefile \
+ src/utils/flacdiff/Makefile \
+ src/utils/flactimer/Makefile \
examples/Makefile \
examples/c/Makefile \
examples/c/decode/Makefile \
diff --git a/doc/html/changelog.html b/doc/html/changelog.html
index 790905be..ea4ee134 100644
--- a/doc/html/changelog.html
+++ b/doc/html/changelog.html
@@ -104,7 +104,7 @@
build system:
diff --git a/src/Makefile.am b/src/Makefile.am
index 7248d54b..d03275aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,6 +36,7 @@ SUBDIRS = \
test_libFLAC \
test_seeking \
test_streams \
+ utils \
$(CPPLIBS_DIRS)
EXTRA_DIST = \
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
new file mode 100644
index 00000000..422dc4f1
--- /dev/null
+++ b/src/utils/Makefile.am
@@ -0,0 +1,18 @@
+# FLAC - Free Lossless Audio Codec
+# Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008 Josh Coalson
+#
+# This file is part the FLAC project. FLAC is comprised of several
+# components distributed under difference licenses. The codec libraries
+# are distributed under Xiph.Org's BSD-like license (see the file
+# COPYING.Xiph in this distribution). All other programs, libraries, and
+# plugins are distributed under the GPL (see COPYING.GPL). The documentation
+# is distributed under the Gnu FDL (see COPYING.FDL). Each file in the
+# FLAC distribution contains at the top the terms under which it may be
+# distributed.
+#
+# Since this particular file is relevant to all components of FLAC,
+# it may be distributed under the Xiph.Org license, which is the least
+# restrictive of those mentioned above. See the file COPYING.Xiph in this
+# distribution.
+
+SUBDIRS = flacdiff flactimer
diff --git a/src/utils/flacdiff/Makefile.am b/src/utils/flacdiff/Makefile.am
new file mode 100644
index 00000000..5897d104
--- /dev/null
+++ b/src/utils/flacdiff/Makefile.am
@@ -0,0 +1,22 @@
+# flacdiff - Displays where two FLAC streams differ
+# Copyright (C) 2007,2008 Josh Coalson
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+EXTRA_DIST = \
+ Makefile.lite \
+ flacdiff.dsp \
+ flacdiff.vcproj \
+ main.cpp
diff --git a/src/utils/flactimer/Makefile.am b/src/utils/flactimer/Makefile.am
new file mode 100644
index 00000000..f77c026e
--- /dev/null
+++ b/src/utils/flactimer/Makefile.am
@@ -0,0 +1,21 @@
+# flactimer - Runs a command and prints timing information
+# Copyright (C) 2007,2008 Josh Coalson
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+EXTRA_DIST = \
+ flactime.dsp \
+ flactime.vcproj \
+ main.cpp