diff --git a/rpcbind.spec b/rpcbind.spec
index e0051c4..e4ac13e 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -96,6 +96,10 @@ if [ -z "$rpcid" -o "$rpcid" != "32" ]; then
 fi
 
 %post
+if [ $1 -eq 1 ] ; then
+	# Initial installation
+	/bin/systemctl enable rpcbind.socket
+fi
 %systemd_post rpcbind.service rpcbind.socket
 
 %preun
@@ -115,6 +119,9 @@ fi
 /sbin/chkconfig --del rpcbind >/dev/null 2>&1 || :
 /bin/systemctl try-restart rpcbind.service >/dev/null 2>&1 || :
 
+%triggerun -- rpcbind > 0.2.2-2.0
+/bin/systemctl enable rpcbind.socket
+
 %files
 %defattr(-,root,root)
 %config(noreplace) /etc/sysconfig/rpcbind
@@ -131,6 +138,7 @@ fi
 * Thu Mar 19 2015 Steve Dickson <steved@redhat.com> - 0.2.2-2.2
 - Changed RPCBDIR to be /var/run so bindings are perserved
   during upgrades but not reboots.
+- Make sure rpcbind.socket gets enabled
 
 * Thu Feb  5 2015 Steve Dickson <steved@redhat.com> - 0.2.2-2.1
 - Added xlogging debugging to rpcbind