diff --git a/epmd.service b/epmd.service
index c029ac4..02c7e36 100644
--- a/epmd.service
+++ b/epmd.service
@@ -5,10 +5,17 @@ Requires=epmd.socket
 
 [Service]
 ExecStart=/usr/bin/epmd -systemd
-ExecStop=/usr/bin/epmd -kill
+#ExecStop=/usr/bin/epmd -kill
 Type=simple
 StandardOutput=journal
 StandardError=journal
+DeviceAllow=/dev/null rw
+PrivateTmp=true
+#CapabilityBoundingSet=
+NoNewPrivileges=true
+Restart=always
+LimitNPROC=1
+LimitFSIZE=0
 User=epmd
 Group=epmd
 
diff --git a/erlang.spec b/erlang.spec
index 0df6175..e77d45f 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -32,7 +32,7 @@
 
 Name:		erlang
 Version:	%{upstream_ver}
-Release:	%{upstream_rel_for_rpm}.4%{?dist}
+Release:	%{upstream_rel_for_rpm}.5%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
 Group:		Development/Languages
@@ -2325,6 +2325,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 02 2014 Peter Lemenkov <lemenkov@gmail.com> - R16B-03.5
+- Improve EPMD service
+
 * Fri Mar 28 2014 Peter Lemenkov <lemenkov@gmail.com> - R16B-03.4
 - Create group and user for EPMD