diff --git a/_service b/_service
index 9985921..095b121 100644
--- a/_service
+++ b/_service
@@ -2,8 +2,8 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">git://github.com/coelckers/gzdoom</param>
-		<param name="revision">g3.5.0</param>
-		<param name="versionformat">3.5.0</param>
+		<param name="revision">g3.6.0</param>
+		<param name="versionformat">3.6.0</param>
 		<!-- non-OSI media -->
 		<param name="exclude">wadsrc_extra</param>
 	</service>
diff --git a/fl2.patch b/fl2.patch
new file mode 100644
index 0000000..bcd6410
--- /dev/null
+++ b/fl2.patch
@@ -0,0 +1,28 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2018-10-16 14:29:56.900427855 +0200
+
+Make the build work with fluidsynth 2.x.
+
+---
+ src/sound/mididevices/music_fluidsynth_mididevice.cpp |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
+===================================================================
+--- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp
++++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
+@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD
+ #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f
+ #define FLUID_CHORUS_DEFAULT_SPEED 0.3f
+ #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f
+-#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
+ 
+ #endif
+ 
++#ifndef FLUID_CHORUS_DEFAULT_TYPE
++#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
++#endif
++
+ // TYPES -------------------------------------------------------------------
+ 
+ // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
diff --git a/gzdoom-3.5.0.tar.xz b/gzdoom-3.5.0.tar.xz
deleted file mode 100644
index 688a8dd..0000000
--- a/gzdoom-3.5.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a58c76511a7d5c4219bd430063c8431037b9cf02c4f28836d42a8dd72453cfb6
-size 7991064
diff --git a/gzdoom-3.6.0.tar.xz b/gzdoom-3.6.0.tar.xz
new file mode 100644
index 0000000..8f74ce1
--- /dev/null
+++ b/gzdoom-3.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:970536a12e1ae718911100e2152f26e73bd7a8505a32f911576b387f4fe78901
+size 8032488
diff --git a/gzdoom.changes b/gzdoom.changes
index 1a8f045..7d8356d 100644
--- a/gzdoom.changes
+++ b/gzdoom.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Oct 16 11:52:51 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to new upstream release 3.6.0
+  * Add OBJ model support
+  * Add HITOWNER flag, when set, allows a projectile to collide
+    with its shooter.
+  * Enabled the linear shadowmap filter.
+  * Added 5x and 6x upscaling with xBRZ
+  * Exports various resurrection-related functions to ZScript.
+- Update to new upstream release 3.5.1
+  * Added post processing support to the software renderer and
+    softpoly.
+- Add fl2.patch
+
 -------------------------------------------------------------------
 Sun Aug  5 12:00:27 UTC 2018 - mardnh@gmx.de
 
diff --git a/gzdoom.spec b/gzdoom.spec
index 94ec6ca..a08ba6b 100644
--- a/gzdoom.spec
+++ b/gzdoom.spec
@@ -12,12 +12,12 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           gzdoom
-Version:        3.5.0
+Version:        3.6.0
 Release:        0
 Summary:        A DOOM source port with graphic and modding extensions
 License:        GPL-3.0-only
@@ -29,6 +29,7 @@ Source:         %name-%version.tar.xz
 Patch1:         gzdoom-waddir.patch
 Patch2:         gzdoom-wadsrc-extra.patch
 Patch3:         gzdoom-staticlibs.patch
+Patch4:         fl2.patch
 Patch5:         gzdoom-lzma.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake >= 2.8.7
@@ -44,8 +45,10 @@ BuildRequires:  pkgconfig(fluidsynth)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libgme)
+BuildRequires:  pkgconfig(libmpg123)
 BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(sdl2)
+BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  pkgconfig(zlib)
 %if 0%{?suse_version} >= 1500
 BuildRequires:  pkgconfig(clzma) >= 17.01
@@ -79,7 +82,7 @@ GZDoom is a port (a modification) of the original Doom source code, featuring:
 
 %prep
 %setup -q
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -p1
 
 %if 0%{?suse_version} >= 1500
 %patch -P 5 -p1
@@ -98,7 +101,9 @@ perl -i -pe 's{<unknown version>}{%version}g' \
 	-DCMAKE_SHARED_LINKER_FLAGS="" \
 	-DCMAKE_EXE_LINKER_FLAGS="" -DCMAKE_MODULE_LINKER_FLAGS="" \
 	-DINSTALL_DOCS_PATH="%_defaultdocdir/%name" \
-	-DINSTALL_PK3_PATH="%_datadir/doom"
+	-DINSTALL_PK3_PATH="%_datadir/doom" \
+	-DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF \
+	-DDYN_SNDFILE=OFF -DDYN_MPG123=OFF
 make %{?_smp_mflags}
 
 %install