diff --git a/xemacs.changes b/xemacs.changes
index 6a49fdc..d0a04f2 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 31 14:51:02 UTC 2012 - werner@suse.de
+
+- Make /var/lib/xemacs/lock/ optional (bnc#764887) 
+
 -------------------------------------------------------------------
 Wed May 30 10:58:22 UTC 2012 - werner@suse.de
 
diff --git a/xemacs.spec b/xemacs.spec
index 5082a2a..779e784 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -41,7 +41,6 @@ BuildRequires:  gpm-devel
 %else
 BuildRequires:  gpm
 %endif
-
 %define	appdefdir  /usr/share/X11
 %define xbindir    /usr/bin
 %define xincludes  /usr/include
@@ -96,6 +95,8 @@ Patch292811:    bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
 Patch301352:    bugzilla-301352-fix-wrong-incrementing-in-macros.patch
 %define _default_patch_fuzz 2
 
+%bcond_with lock
+
 %description
 This is the current version of XEmacs, formerly known as Lucid-Emacs.
 It is related to other versions of Emacs, in particular GNU Emacs. Its
@@ -379,8 +380,10 @@ set +o posix
 #
 mkdir -p %{buildroot}/usr/share/xemacs/site-lisp/lisp
 mkdir -p %{buildroot}/usr/share/xemacs/site-packages/lisp/term
+%if %{with lock}
 mkdir -p %{buildroot}/var/lib/xemacs/lock
 chmod 1777 %{buildroot}/var/lib/xemacs/lock
+%endif
 make DESTDIR=%{buildroot} install
 mv %{buildroot}%{xbindir}/xemacs-21.?-??? %{buildroot}%{xbindir}/xemacs
 # fix up the load-history to make it possible to use find-function
@@ -528,6 +531,7 @@ cat xe-list-el-without-elc xe-list-elc-without-el xe-list-elc-with-el \
 # packages:
 rm -rf %{buildroot}/usr/lib/xemacs/%{version}/*-suse-linux/include/
 
+%if %{with lock}
 %if %{defined verify_permissions}
 %verifyscript
 %verify_permissions -e /var/lib/xemacs/lock
@@ -537,6 +541,7 @@ rm -rf %{buildroot}/usr/lib/xemacs/%{version}/*-suse-linux/include/
 %post
 %set_permissions /var/lib/xemacs/lock
 %endif
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -606,7 +611,9 @@ rm -rf %{buildroot}
 %dir /usr/share/xemacs/site-lisp/
 %dir /usr/share/xemacs/site-lisp/lisp/
 %dir /var/lib/xemacs/
+%if %{with lock}
 %dir %verify(not mode group) %attr(1775,root,trusted) /var/lib/xemacs/lock/
+%endif
 
 %files       -n xemacs-info
 %defattr(-,root,root)