diff --git a/amanda-udp.socket b/amanda-udp.socket
new file mode 100644
index 0000000..6d94ebe
--- /dev/null
+++ b/amanda-udp.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Amanda Activation Socket
+
+[Socket]
+Service=amanda-udp.service
+ListenDatagram=10080
+
+[Install]
+WantedBy=sockets.target
diff --git a/amanda-udp@.service b/amanda-udp@.service
new file mode 100644
index 0000000..1054252
--- /dev/null
+++ b/amanda-udp@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Amanda Backup System
+After=local-fs.target
+
+[Service]
+User=amandabackup
+Group=disk
+ExecStart=/usr/sbin/amandad -auth=bsd amdump 
+StandardInput=socket
diff --git a/amanda.spec b/amanda.spec
index e3aadc4..9d83ca3 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -10,7 +10,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 3.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -19,6 +19,8 @@ Source9: amanda.socket
 Source10: amanda@.service
 Source11: activate-devpay.1.gz
 Source12: killpgrp.8
+Source13: amanda-udp.socket
+Source14: amanda-udp@.service
 Patch2: amanda-3.1.1-xattrs.patch
 Patch3: amanda-3.1.1-tcpport.patch
 Patch6: amanda-3.2.0-config-dir.patch
@@ -139,6 +141,8 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda
 install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts
 install -p -m 644 -D %{SOURCE9} %{buildroot}%{_unitdir}/amanda.socket
 install -p -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/amanda@.service
+install -p -m 644 -D %{SOURCE13} %{buildroot}%{_unitdir}/amanda-udp.socket
+install -p -m 644 -D %{SOURCE14} %{buildroot}%{_unitdir}/amanda-udp@.service
 install -D %{SOURCE11}  %{buildroot}/%{_mandir}/man1/activate-devpay.1.gz
 install -D %{SOURCE12}  %{buildroot}/%{_mandir}/man8/killpgrp.8.gz
 
@@ -174,13 +178,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %post
 /sbin/ldconfig
 %systemd_post amanda.socket
+%systemd_post amanda-udp.socket
 
 %preun
 %systemd_preun amanda.socket
+%systemd_preun amanda-udp.socket
 
 %postun
 /sbin/ldconfig
 %systemd_postun_with_restart amanda.socket
+%systemd_postun_with_restart amanda-udp.socket
 
 %post client -p /sbin/ldconfig
 
@@ -195,6 +202,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc COPYRIGHT* NEWS README
 %{_unitdir}/amanda@.service
 %{_unitdir}/amanda.socket
+%{_unitdir}/amanda-udp@.service
+%{_unitdir}/amanda-udp.socket
 
 
 %{_libdir}/libamanda-*.so
@@ -454,16 +463,19 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
-* Tue Jun 25 2013 Petr Hracek <phracek@redhat.com> - 3.3.3-2
+* Tue Jun 25 2013 Petr Hracek <phracek@redhat.com> - 3.3.3-3
 - Remove dependency on dump in RHEL-7
 
+* Tue Jun 18 2013 Petr Hracek <phracek@redhat.com> - 3.3.3-2
+- Added systemd udp unit files
+
 * Fri Mar 22 2013 Petr Hracek <phracek@redhat.com> - 3.3.3-1
 - New upstream version
 - Dependecy to /usr/sbin/service was removed.
  Instead of /usr/sbin/service systemd files are used.
 
 * Thu Mar 21 2013 Petr Hracek <phracek@redhat.com> - 3.3.2-5
-- Requires /sbin/service was changed to /usr/sbin/service
+- Fix (#924326) Requires /sbin/service was changed to /usr/sbin/service
 
 * Thu Jan 31 2013 Petr Hracek <phracek@redhat.com> - 3.3.2-4
 - fix (#858703) add killpgrp(8) man page to the amanda-client package