diff --git a/ChangeLog b/ChangeLog
index 11a5d360..64fa4f38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Thu Mar  7 10:13:08 CET 2013
+	Fix bug in postprocessor URL parser (#2818). -jgresula
+
 Mon Mar  4 13:45:35 CET 2013
 	Fix dropping of SSL connections if uptime is less than
         MHD_OPTION_CONNECTION_TIMEOUT due to integer underflow (#2802). -greed
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index ca20a58f..14e18421 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -65,7 +65,8 @@ check_PROGRAMS = \
 if HAVE_POSTPROCESSOR
 check_PROGRAMS += \
   postprocessor_test \
-  postprocessor_large_test 
+  postprocessor_large_test \
+  test_postprocessor_amp
 endif
 
 TESTS = $(check_PROGRAMS)
@@ -80,6 +81,11 @@ postprocessor_test_SOURCES = \
 postprocessor_test_LDADD = \
   $(top_builddir)/src/daemon/libmicrohttpd.la 
 
+test_postprocessor_amp_SOURCES = \
+  test_postprocessor_amp.c
+test_postprocessor_amp_LDADD = \
+  $(top_builddir)/src/daemon/libmicrohttpd.la 
+
 postprocessor_large_test_SOURCES = \
   postprocessor_large_test.c
 postprocessor_large_test_LDADD = \
diff --git a/src/daemon/postprocessor.c b/src/daemon/postprocessor.c
index 9be5e68f..838f71f5 100644
--- a/src/daemon/postprocessor.c
+++ b/src/daemon/postprocessor.c
@@ -435,7 +435,7 @@ post_process_urlencoded (struct MHD_PostProcessor *pp,
                 {
                   pp->state = PP_ExpectNewLine;
                 }
-              else
+              else if (post_data[poff] == '&')
                 {
                   poff++;       /* skip '&' */
                   pp->state = PP_Init;