diff --git a/configure.ac b/configure.ac
index 0cd6383..5db210f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,8 +66,6 @@ AC_CHECK_LIB(fuse,fuse_new, [FUSE_LIBS="-lfuse"],
 	and rerun configure, eg:
 	export LDFLAGS=-L/usr/local/lib ])],)
 
-AC_CHECK_HEADERS([ulockmgr.h])
-AC_CHECK_LIB(ulockmgr,ulockmgr_op, [FUSE_LIBS="$FUSE_LIBS -lulockmgr"])
 AC_SUBST(FUSE_LIBS)
 
 # check for a supported FUSE_MAJOR_VERSION.
diff --git a/encfs/encfs.cpp b/encfs/encfs.cpp
index 48f1b95..26c6fa9 100644
--- a/encfs/encfs.cpp
+++ b/encfs/encfs.cpp
@@ -37,12 +37,6 @@
 #include <sys/xattr.h>
 #endif
 
-#ifdef HAVE_ULOCKMGR_H
-extern "C" {
-#include <ulockmgr.h>
-}
-#endif
-
 
 #include <string>
 #include <map>
@@ -756,31 +750,3 @@ int encfs_removexattr( const char *path, const char *name )
 }
 #endif // HAVE_XATTR
 
-#ifdef HAVE_ULOCKMGR_H
-int _do_lock(FileNode *fnode, 
-	tuple<int, struct flock *, struct fuse_file_info *> data)
-{
-    int cmd = data.get<0>();
-    struct flock *lock = data.get<1>();
-    struct fuse_file_info *fi = data.get<2>();
-
-    int fh  = fnode->open( O_RDONLY );
-    if(fh >= 0)
-    {
-	return ulockmgr_op(fh, cmd, lock, &fi->lock_owner,
-		sizeof(fi->lock_owner));
-    } else
-    {
-	rInfo("open failed in lock of %s", fnode->cipherName());
-	return fh;
-    }
-}
-
-int encfs_lock( const char *path, struct fuse_file_info *fi, int cmd,
-	struct flock *lock)
-{
-    return withFileNode( "lock", path, fi,
-	    _do_lock, make_tuple(cmd, lock, fi) );
-}
-#endif
-
diff --git a/encfs/encfs.h b/encfs/encfs.h
index 3f9e827..ce0fcfa 100644
--- a/encfs/encfs.h
+++ b/encfs/encfs.h
@@ -92,12 +92,6 @@ int encfs_listxattr( const char *path, char *list, size_t size );
 int encfs_removexattr( const char *path, const char *name );
 #endif
 
-#ifdef HAVE_ULOCKMGR_H
-struct flock;
-int encfs_lock( const char *path, struct fuse_file_info *fi, int cmd,
-	struct flock *lock );
-#endif
-
 int encfs_utimens( const char *path, const struct timespec ts[2] );
 
 #endif
diff --git a/encfs/main.cpp b/encfs/main.cpp
index 83620f9..b50330a 100644
--- a/encfs/main.cpp
+++ b/encfs/main.cpp
@@ -558,9 +558,6 @@ int main(int argc, char *argv[])
     //encfs_oper.create = encfs_create;
     encfs_oper.ftruncate = encfs_ftruncate;
     encfs_oper.fgetattr = encfs_fgetattr;
-#ifdef HAVE_ULOCKMGR_H
-    encfs_oper.lock = encfs_lock;
-#endif // HAVE_ULOCKMGR_H
     encfs_oper.utimens = encfs_utimens;
     //encfs_oper.bmap = encfs_bmap;