diff --git a/tvheadend-4.0.10.tar.gz b/tvheadend-4.0.10.tar.gz
new file mode 100644
index 0000000..6ac9c1a
--- /dev/null
+++ b/tvheadend-4.0.10.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f610e7d9f3bf6cff05cd73830a66ee0c74bc5291c4c9d08369364c4c681ebf23
+size 15825140
diff --git a/tvheadend-4.0.9.tar.gz b/tvheadend-4.0.9.tar.gz
deleted file mode 100644
index c26d90e..0000000
--- a/tvheadend-4.0.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cea1106f45e286e8c25e6b2f0a581c28bd85e93ce3801ecaac7041568a214977
-size 15825419
diff --git a/tvheadend-fix-misleading-indent.patch b/tvheadend-fix-misleading-indent.patch
deleted file mode 100644
index 5584bc5..0000000
--- a/tvheadend-fix-misleading-indent.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur a/src/htsmsg.c b/src/htsmsg.c
---- a/src/htsmsg.c	2016-03-14 04:10:57.000000000 -0500
-+++ b/src/htsmsg.c	2016-09-26 16:51:51.367645274 -0500
-@@ -760,13 +760,15 @@
-     case HMF_MAP:
-       printf("MAP) = {\n");
-       htsmsg_print0(&f->hmf_msg, indent + 1);
--      for(i = 0; i < indent; i++) printf("\t"); printf("}\n");
-+      for(i = 0; i < indent; i++) printf("\t");
-+      printf("}\n");
-       break;
- 
-     case HMF_LIST:
-       printf("LIST) = {\n");
-       htsmsg_print0(&f->hmf_msg, indent + 1);
--      for(i = 0; i < indent; i++) printf("\t"); printf("}\n");
-+      for(i = 0; i < indent; i++) printf("\t");
-+      printf("}\n");
-       break;
-       
-     case HMF_STR:
diff --git a/tvheadend.changes b/tvheadend.changes
index 28de599..75a02b9 100644
--- a/tvheadend.changes
+++ b/tvheadend.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 10 08:20:53 UTC 2017 - aloisio@gmx.com
+
+- Update to version 4.0.10. For a changelog see
+  https://github.com/tvheadend/tvheadend/compare/v4.0.9...v4.0.10
+- Dropped tvheadend-fix-misleading-indent.patch (merged upstream)
+
 -------------------------------------------------------------------
 Thu Mar 16 08:43:19 UTC 2017 - sleep_walker@opensuse.org
 
diff --git a/tvheadend.spec b/tvheadend.spec
index bbab158..9772f26 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -21,7 +21,7 @@
 %define htsuser hts
 %define homedir %{_localstatedir}/lib/tvheadend
 Name:           tvheadend
-Version:        4.0.9
+Version:        4.0.10
 Release:        0
 Summary:        A TV Streaming Server
 # parsers are from FFMpeg project under LGPL-2.1
@@ -35,8 +35,6 @@ Source2:        %{name}-rpmlintrc
 Source3:        %{name}_super
 # PATCH-FIX-OPENSUSE tvheadend-4.0_no-werror.patch -- Do not treat warnings as errors.
 Patch0:         %{name}-4.0_no-werror.patch
-# PATCH-FIX-OPENSUSE tvheadend-fix-misleading-indent.patch malcolmlewis@opensuse.org -- Fix warning/error produced with gcc-6.
-Patch1:         %{name}-fix-misleading-indent.patch
 # PATCH-FIX-OPENSUSE tvheadend-fix-service-dependency.patch -- do not wait for or require syslog
 Patch2:         %{name}-fix-service-dependency.patch
 # FFMPEG related patches
@@ -54,7 +52,9 @@ BuildRequires:  pkgconfig(libssl)
 BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(liburiparser)
 BuildRequires:  pkgconfig(zlib)
+%if 0%{?suse_version} > 1320
 Requires(pre):  group(%{htsgroup})
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 
@@ -69,7 +69,6 @@ scheduling recordings.
 %prep
 %setup -q
 %patch0
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1