diff --git a/.abf.yml b/.abf.yml
index f3fac5b..e607403 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  "minidlna_1.0.20_src.tar.gz": dadc604af00d6b0fdd1145ce2dfe79e774215df0
+  "minidlna_1.0.22_src.tar.gz": 21bb1004f2dc22a91cd792827c7ae779de56917c
diff --git a/initscript b/initscript
index bd1edad..e9f871e 100755
--- a/initscript
+++ b/initscript
@@ -8,10 +8,9 @@
 # processname: minidlna
 # pidfile: /var/run/minidlna.pid
 ### BEGIN INIT INFO
-# Provides: haldaemon
-# Required-Start:
-# Required-Stop:
-# Should-Start: acpid
+# Required-Start: $network
+# Required-Stop: $network
+# Should-Start:
 # Default-Start: 3 4 5 7
 # Short-Description: DLNA media server
 # Description: The MiniDLNA daemon is an UPnP-A/V and DLNA service which
diff --git a/minidlna.service b/minidlna.service
new file mode 100644
index 0000000..b6263be
--- /dev/null
+++ b/minidlna.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=MiniDLNA is a DLNA/UPnP-AV server software
+After=syslog.target local-fs.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/minidlna.pid
+ExecStart=/usr/sbin/minidlna -f /etc/minidlna.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/minidlna.spec b/minidlna.spec
index f2a8475..4e2651f 100644
--- a/minidlna.spec
+++ b/minidlna.spec
@@ -1,23 +1,29 @@
-Name: minidlna
-Version: 1.0.20
-Release: %mkrel 1
-Summary: A DLNA/UPnP-AV compliant media server
-URL: http://sourceforge.net/projects/minidlna/
-Group: Networking/Other
-License: GPL
-Source: minidlna_%{version}_src.tar.gz
-Source1: initscript
-Source2: minidlna.conf
-Source3: minidlna.1
-Source4: minidlna.conf.5
+Summary:	A DLNA/UPnP-AV compliant media server
+Name:		minidlna
+Version:	1.0.22
+Release:	%mkrel 4
+URL:		http://sourceforge.net/projects/minidlna/
+Group:		Networking/Other
+License:	GPL
+Source0:	minidlna_%{version}_src.tar.gz
+Source1:	initscript
+Source2:	minidlna.conf
+Source3:	minidlna.1
+Source4:	minidlna.conf.5
+Source5:	%{name}.service
 # Local patches
 # Selected patches from development tree
 #Patch100:
 # Selected patches from upstream patch tracker
 #Patch200:
-BuildRequires: libflac-devel libid3tag-devel libexif-devel libjpeg-devel
-BuildRequires: libsqlite3-devel libffmpeg-devel libvorbis-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires:	libflac-devel
+BuildRequires:	libid3tag-devel
+BuildRequires:	libexif-devel
+BuildRequires:	libjpeg-devel
+BuildRequires:	libsqlite3-devel
+BuildRequires:	libffmpeg-devel
+BuildRequires:	libvorbis-devel
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 %description
 MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully
@@ -37,19 +43,30 @@ sed -i -e 's!^\(#define OS_NAME\).*!\1 "%{product_vendor}"!
 	s!^\(#define DEFAULT_DB_PATH\).*!\1 "/var/cache/%{name}"!
 	s!^\(#define DEFAULT_LOG_PATH\).*!\1 "/var/log"!' config.h
 
+
 %build
+%serverbuild
+%setup_compile_flags
+
+#(tpg) obey %optflags
+sed -i 's/CFLAGS = -Wall -g -O3/CFLAGS +=/' Makefile
+
+#(tpg) verbose make
+sed -i 's/@$(CC)/$(CC)/' Makefile
+
 %make
 
 %install
 rm -rf %{buildroot}
-install -m 755 -D %{_sourcedir}/initscript %{buildroot}%{_initrddir}/minidlna
-install -m 644 -D %{_sourcedir}/minidlna.conf \
-  %{buildroot}%{_sysconfdir}/minidlna.conf
+%if %mdkver >= 201100
+install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}.service
+%else
+install -m 755 -D %{SOURCE1} %{buildroot}%{_initrddir}/minidlna
+%endif
+install -m 644 -D %{_sourcedir}/minidlna.conf %{buildroot}%{_sysconfdir}/minidlna.conf
 install -m 755 -D minidlna %{buildroot}%{_sbindir}/minidlna
-install -m 644 -D %{_sourcedir}/minidlna.1 \
-  %{buildroot}%{_mandir}/man1/minidlna.1
-install -m 644 -D %{_sourcedir}/minidlna.conf.5 \
-  %{buildroot}%{_mandir}/man5/minidlna.conf.5
+install -m 644 -D %{_sourcedir}/minidlna.1 %{buildroot}%{_mandir}/man1/minidlna.1
+install -m 644 -D %{_sourcedir}/minidlna.conf.5 %{buildroot}%{_mandir}/man5/minidlna.conf.5
 
 %clean
 rm -rf %{buildroot}
@@ -64,14 +81,37 @@ rm -rf %{buildroot}
 %defattr(0644,root,root,0755)
 %doc README
 %attr(755,-,-) %{_sbindir}/minidlna
+%if %mdkver >= 201100
+%{_unitdir}/%{name}.service
+%else
 %attr(755,-,-) %{_initrddir}/minidlna
+%endif
 %config(noreplace) %{_sysconfdir}/minidlna.conf
 %{_mandir}/man1/minidlna.1*
 %{_mandir}/man5/minidlna.conf.5*
 
 
 %changelog
-* Mon Jul 04 2011 Claudio Matsuoka <claudio@mandriva.com> 1.0.20-1mdv2011.0
+* Sat Jan 07 2012 Tomasz Pawel Gajc <tpg@mandriva.org> 1.0.22-4mdv2012.0
++ Revision: 758635
+- obey %%optflags
+- switch to verbose mode while compiling
+- provide minidlna.service
+- spec file clean
+
+* Wed Dec 21 2011 Tomasz Pawel Gajc <tpg@mandriva.org> 1.0.22-3
++ Revision: 744182
+- revert use os setup_compile_flags
+- make use of %%serverbuild_hardened
+- use %%setup_compile_flags
+
+* Sat Sep 17 2011 Claudio Matsuoka <claudio@mandriva.com> 1.0.22-1
++ Revision: 700180
+- new upstream release 1.0.22
+  * includes fixes for TiVo, Marantz receivers, Roku SoundBridge and
+    Samsung series B and D TVs.
+
+* Mon Jul 04 2011 Claudio Matsuoka <claudio@mandriva.com> 1.0.20-1
 + Revision: 688671
 - new upstream release 1.0.20
   * Fix a crash bug when scanning MPEG-TS files with odd packet sizes