diff --git a/.gitignore b/.gitignore
index f7ec90589..551ab47c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ test/read_conf
 test/run_input
 test/read_mixer
 test/dump_playlist
+test/run_normalize
diff --git a/Makefile.am b/Makefile.am
index 3ca89e165..049506980 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -742,6 +742,7 @@ noinst_PROGRAMS = \
 	test/run_output \
 	test/read_mixer \
 	test/run_convert \
+	test/run_normalize \
 	test/software_volume
 
 test_read_conf_CPPFLAGS = $(AM_CPPFLAGS) \
@@ -867,6 +868,14 @@ test_software_volume_SOURCES = test/software_volume.c \
 test_software_volume_LDADD = \
 	$(GLIB_LIBS)
 
+test_run_normalize_SOURCES = test/run_normalize.c \
+	src/audio_check.c \
+	src/audio_parser.c \
+	src/AudioCompress/compress.c \
+	src/normalize.c
+test_run_normalize_LDADD = \
+	$(GLIB_LIBS)
+
 test_run_convert_SOURCES = test/run_convert.c \
 	src/audio_check.c \
 	src/audio_parser.c \
diff --git a/test/run_normalize.c b/test/run_normalize.c
new file mode 100644
index 000000000..979be9201
--- /dev/null
+++ b/test/run_normalize.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * This program is a command line interface to MPD's normalize library
+ * (based on AudioCompress).
+ *
+ */
+
+#include "config.h"
+#include "normalize.h"
+#include "audio_parser.h"
+#include "audio_format.h"
+#include "conf.h"
+
+#include <glib.h>
+
+#include <stddef.h>
+#include <unistd.h>
+#include <string.h>
+
+bool
+config_get_bool(const char *name, bool default_value)
+{
+	if (strcmp(name, CONF_VOLUME_NORMALIZATION) == 0)
+		return true;
+	else
+		return default_value;
+}
+
+int main(int argc, char **argv)
+{
+	GError *error = NULL;
+	struct audio_format audio_format;
+	bool ret;
+	static char buffer[4096];
+	ssize_t nbytes;
+
+	if (argc > 2) {
+		g_printerr("Usage: run_normalize [FORMAT] <IN >OUT\n");
+		return 1;
+	}
+
+	if (argc > 1) {
+		ret = audio_format_parse(&audio_format, argv[1],
+					 false, &error);
+		if (!ret) {
+			g_printerr("Failed to parse audio format: %s\n",
+				   error->message);
+			return 1;
+		}
+	} else
+		audio_format_init(&audio_format, 48000, 16, 2);
+
+	initNormalization();
+
+	while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) {
+		normalizeData(buffer, nbytes, &audio_format);
+		write(1, buffer, nbytes);
+	}
+
+	finishNormalization();
+}