diff --git a/.gitignore b/.gitignore
index 6606b6b..7749217 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,3 @@
-nfs.doc.tar.gz
-nfs-utils-1.1.6.tar.bz2
-nfs-utils-1.2.0.tar.bz2
-nfs-utils-1.2.1.tar.bz2
-nfs-utils-1.2.2.tar.bz2
-/nfs-utils-1.2.3.tar.bz2
-/nfs-utils-1.2.4.tar.bz2
+x86_64
+nfs-utils-1.2.5
 /nfs-utils-1.2.5.tar.bz2
diff --git a/nfs-blkmap.service b/nfs-blkmap.service
new file mode 100644
index 0000000..7897bb2
--- /dev/null
+++ b/nfs-blkmap.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=pNFS block layout mapping daemon
+Wants=var-lib-nfs-rpc_pipefs.mount
+Requires=var-lib-nfs-rpc_pipefs.mount
+
+[Service]
+Type=forking
+StandardError=syslog+console
+EnvironmentFile=-/etc/sysconfig/nfs
+ExecStart=/usr/sbin/blkmapd $BLKMAPDARGS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 8c48397..f9f6c6b 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -16,7 +16,8 @@ Source12: nfs-secure.service
 Source13: nfs-secure-server.service
 Source14: nfs-server.service
 Source15: nfs-idmap.service
-%define nfs_services %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15}
+Source16: nfs-blkmap.service
+%define nfs_services %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16}
 
 Source20: var-lib-nfs-rpc_pipefs.mount
 Source21: proc-fs-nfsd.mount
@@ -271,7 +272,7 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Mon Sep 26 2011 Steve Dickson <steved@redhat.com> 1.2.5
+* Tue Sep 27 2011 Steve Dickson <steved@redhat.com> 1.2.5-0
 - Update to upstream release: nfs-utils-1.2.5 (bz 717931)
 
 * Wed Sep 21 2011 Steve Dickson <steved@redhat.com> 1.2.4-11
diff --git a/nfs.sysconfig b/nfs.sysconfig
index a185258..a892f91 100644
--- a/nfs.sysconfig
+++ b/nfs.sysconfig
@@ -39,3 +39,6 @@ RPCSVCGSSDARGS=""
 # To enable RDMA support on the server by setting this to
 # the port the server should listen on
 #RDMA_PORT=20049 
+#
+# Optional arguments passed to blkmapd. See blkmapd(8)
+BLKMAPDARGS=""