diff --git a/debian/changelog b/debian/changelog
index 326a54c..ce41002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@
 
   * New upstream release.
   * Drop add_ldflags.patch, fixed upstream.
+  * Disable statically linking libgcc and libstdc++
+    - Add disable_static_linking.patch
 
  -- Felix Geyer <fgeyer@debian.org>  Tue, 10 Jul 2018 19:13:43 +0200
 
diff --git a/debian/patches/disable_static_linking.patch b/debian/patches/disable_static_linking.patch
new file mode 100644
index 0000000..45c8878
--- /dev/null
+++ b/debian/patches/disable_static_linking.patch
@@ -0,0 +1,25 @@
+Description: Disable statically linking libgcc and libstdc++
+Bug: https://github.com/badaix/snapcast/issues/404
+
+--- a/client/Makefile
++++ b/client/Makefile
+@@ -81,7 +81,7 @@ else
+ CXX       = g++
+ STRIP     = strip
+ CXXFLAGS += -pthread -DHAS_VORBIS -DHAS_ALSA -DHAS_AVAHI -DHAS_DAEMON
+-LDFLAGS  += -lrt -lasound -lvorbis -lavahi-client -lavahi-common -static-libgcc -static-libstdc++ -latomic
++LDFLAGS  += -lrt -lasound -lvorbis -lavahi-client -lavahi-common -latomic
+ OBJ      += ../common/daemon.o player/alsaPlayer.o browseZeroConf/browseAvahi.o
+ 
+ endif
+--- a/server/Makefile
++++ b/server/Makefile
+@@ -87,7 +87,7 @@ else
+ CXX       = g++
+ STRIP     = strip
+ CXXFLAGS += -DHAS_AVAHI -DHAS_DAEMON -pthread
+-LDFLAGS  += -lrt -lavahi-client -lavahi-common -static-libgcc -static-libstdc++
++LDFLAGS  += -lrt -lavahi-client -lavahi-common
+ OBJ      += ../common/daemon.o publishZeroConf/publishAvahi.o 
+ 
+ endif
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..02fb9f2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_static_linking.patch