diff --git a/flavour.patch b/flavour.patch
new file mode 100644
index 0000000..62b221c
--- /dev/null
+++ b/flavour.patch
@@ -0,0 +1,64 @@
+--- psgml-maint.el
++++ psgml-maint.el	2012-07-02 12:28:34.284377856 +0000
+@@ -78,7 +78,7 @@
+ (defun psgml-compile-files ()
+   "Compile the PSGML source files that needs compilation."
+   (interactive)
+-  (psgml-find-source-dir (interactive-p))
++  (psgml-find-source-dir (called-interactively-p))
+   (let ((default-directory psgml-source-dir)
+ 	(load-path (cons psgml-source-dir load-path)))
+     (mapcar (function psgml-byte-compile-file)
+--- psgml-parse.el
++++ psgml-parse.el	2012-07-02 13:03:42.892010400 +0000
+@@ -440,7 +440,7 @@ Applicable to XML.")
+ ;; set of moves: list of moves
+ 
+ (defmacro sgml-add-move-to-set (token node set)
+-  (`(cons (cons (, token) (, node)) (, set))))
++  `(cons (cons ,token ,node) , set))
+ 
+ (defmacro sgml-moves-lookup (token set)
+   (` (assq (, token) (, set))))
+@@ -460,7 +460,7 @@ Applicable to XML.")
+   (` (cddr (, s))))
+ 
+ (defmacro sgml-state-final-p (s)
+-  (`(null (sgml-state-reqs (, s)))))
++  `(null (sgml-state-reqs ,s)))
+ 
+ ;; adding moves
+ ;; *** Should these functions check for ambiguity?
+@@ -904,8 +904,8 @@ If ATTSPEC is nil, nil is returned."
+   (cons
+    'progn
+    (loop for n in names collect
+-	 (`(defmacro (, (intern (format "sgml-eltype-%s" n))) (et)
+-	     (list 'get et ''(, n)))))))
++	 `(defmacro ,(intern (format "sgml-eltype-%s" n)) (et)
++	     (list 'get et '',n)))))
+ 
+ (sgml-prop-fields
+  ;;flags			; optional tags and mixed
+--- xxml.el
++++ xxml.el	2012-07-02 12:28:42.168509922 +0000
+@@ -293,7 +293,7 @@ Use nil to silence all progress.")
+ (defun xxml-version ()
+   "Identifies the current version of this module."
+   (interactive)
+-  (if (interactive-p)
++  (if (called-interactively-p)
+       (message xxml-version)
+     xxml-version))
+ 
+--- xxml/xxml.el
++++ xxml/xxml.el	2012-07-02 12:28:38.396510520 +0000
+@@ -293,7 +293,7 @@ Use nil to silence all progress.")
+ (defun xxml-version ()
+   "Identifies the current version of this module."
+   (interactive)
+-  (if (interactive-p)
++  (if (called-interactively-p)
+       (message xxml-version)
+     xxml-version))
+ 
diff --git a/psgml.changes b/psgml.changes
index 2be15f3..39aaf4d 100644
--- a/psgml.changes
+++ b/psgml.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jul  2 13:04:56 UTC 2012 - werner@suse.de
+
+- Add fix for new emacs 24.1, compare with
+  https://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00259.html 
+
+-------------------------------------------------------------------
+Sun May  9 06:10:13 UTC 2010 - aj@suse.de
+
+- Fix build with new patch.
+
 -------------------------------------------------------------------
 Wed Dec  2 18:46:32 UTC 2009 - coolo@novell.com
 
diff --git a/psgml.spec b/psgml.spec
index 65764e6..e9fdbbb 100644
--- a/psgml.spec
+++ b/psgml.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package psgml (Version 1.3.2)
+# spec file for package psgml
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,13 +21,13 @@
 Name:           psgml
 BuildRequires:  emacs-nox unzip
 %define tdtd tdtd.zip
-License:        GPLv2+ ; Public Domain, Freeware
+License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Productivity/Editors/Emacs
 Requires:       emacs_program
 AutoReqProv:    on
 Summary:        Emacs Add-On to edit SGML/XML documents
 Version:        1.3.2
-Release:        243
+Release:        244
 # Source:       http://belnet.dl.sourceforge.net/sourceforge/psgml/psgml-%{version}.tar.bz2
 Source:         ftp://ftp.lysator.liu.se/pub/sgml/ALPHA/psgml-%{version}.tar.gz
 Source1:        http://home.sprynet.com/sprynet/dmeggins/psgml-dsssl.el
@@ -46,6 +46,7 @@ Patch4:         psgml-1.3.1-texi-category.diff
 Patch5:         psgml-xxml-namespace-face.diff
 Patch6:         tdtd-dtd-patch
 Patch7:         xxml-indentation.diff
+Patch8:         flavour.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Url:            http://sourceforge.net/projects/psgml/
@@ -90,11 +91,14 @@ cp -p %{SOURCE5} .
 %setup -q -T -D -a 2
 mv psgml-jade/psgml-jade.el .
 unzip -o -a %{SOURCE3}
+# Add write permissions so that we can patch it
+chmod u+w tutorial.txt
 cp -p %{SOURCE6} README.SuSE
 cp -p %{SOURCE7} .
 cp -p %{SOURCE8} .
 cp -p %{S:9} .
 %patch -p 1 -P 6
+%patch8
 
 %build
 ./configure --prefix=%{_prefix} --infodir=%{_infodir}