diff --git a/fix-syntax-error-in-example-conf.patch b/fix-syntax-error-in-example-conf.patch
deleted file mode 100644
index b36a3e4..0000000
--- a/fix-syntax-error-in-example-conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/rabbitmq.config.example
-+++ docs/rabbitmq.config.example
-@@ -336,7 +336,7 @@
-      %% {reconnect_delay, 2.5}
- 
-      %% ]} %% End of my_first_shovel
--    ]},
-+    ]}
-    %% Rather than specifying some values per-shovel, you can specify
-    %% them for all shovels here.
-    %%
diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index 5cadbd7..80068e8 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -3,6 +3,7 @@ Thu Mar 27 11:20:12 UTC 2014 - dmueller@suse.com
 
 - update to 3.2.4:
   * Several bug fixes, no detailed changelog available
+- remove fix-syntax-error-in-example-conf.patch: merged upstream
 
 -------------------------------------------------------------------
 Fri Jan 24 09:17:00 UTC 2014 - dmueller@suse.com
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index 3ffc573..73667b8 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -41,7 +41,6 @@ Source6:        rabbitmq-server.service
 Source7:        rabbitmq-server.tmpfiles.d.conf
 Patch0:         no-nmap.patch
 Patch1:         no-remove-common.patch
-Patch2:         fix-syntax-error-in-example-conf.patch
 BuildRequires:  erlang
 BuildRequires:  erlang-src
 BuildRequires:  fdupes
@@ -103,7 +102,6 @@ This package includes the RabbitMQ AMQP language bindings for Erlang.
 %setup -q
 %patch0
 %patch1
-%patch2
 
 %build
 make all VERSION=%{version}