diff --git a/joe-3.5-fix_locale.patch b/joe-3.5-fix_locale.patch
deleted file mode 100644
index a60ab10..0000000
--- a/joe-3.5-fix_locale.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- utf8.c
-+++ utf8.c
-@@ -340,10 +340,24 @@ struct charmap *locale_map;
- struct charmap *locale_map_non_utf8;
- 			/* Old, non-utf8 version of locale */
- 
-+static void get_language(void)
-+{
-+	char *s;
-+	if((s = getenv("LC_ALL")) == NULL)
-+		if((s = getenv("LC_MESSAGES")) == NULL)
-+			s = getenv("LANG");
-+
-+	s = (s != NULL) ? zdup(s) : USTR "ascii";
-+	locale_lang = s;
-+	return;
-+}
-+
- void joe_locale()
- {
- 	unsigned char *s, *t, *u;
- 
-+	get_language();
-+
- 	s=(unsigned char *)getenv("LC_ALL");
- 	if (!s) {
- 		s=(unsigned char *)getenv("LC_CTYPE");
-@@ -362,8 +376,6 @@ void joe_locale()
- 	if ((t=zrchr(s,'.')))
- 		*t = 0;
- 
--	locale_lang = s;
--
- #ifdef HAVE_SETLOCALE
- 	setlocale(LC_ALL,(char *)s);
- 	non_utf8_codeset = zdup((unsigned char *)nl_langinfo(CODESET));
-
- 	  	 
diff --git a/joe-3.0-rc.patch b/joe-3.7-additional_key_mappings.patch
similarity index 66%
rename from joe-3.0-rc.patch
rename to joe-3.7-additional_key_mappings.patch
index f5626ea..658266b 100644
--- a/joe-3.0-rc.patch
+++ b/joe-3.7-additional_key_mappings.patch
@@ -1,16 +1,5 @@
 --- rc/jmacsrc.in
 +++ rc/jmacsrc.in
-@@ -876,6 +875,10 @@
- -wordwrap
- -syntax mail
- 
-+ RPM spec file
-+*.spec
-+-syntax spec
-+
-  THIRD SECTION: Named help screens:
- 
-  Use \i to turn on/off inverse video
 @@ -1249,6 +1252,7 @@
  home		^A
  home		^[ [ H
@@ -29,17 +18,6 @@
  execmd		^[ x
 --- rc/joerc.in
 +++ rc/joerc.in
-@@ -908,6 +908,10 @@
- -wordwrap
- -syntax mail
- 
-+ RPM spec file
-+*.spec
-+-syntax spec
-+
-  THIRD SECTION: Named help screens:
- 
-  Use \i to turn on/off inverse video
 @@ -1325,6 +1329,9 @@
   bol      ^# SP A
  home		.kh
@@ -62,17 +40,6 @@
  exsave		^K x
 --- rc/jpicorc.in
 +++ rc/jpicorc.in
-@@ -902,6 +902,10 @@
- -wordwrap
- -syntax mail
- 
-+ RPM spec file
-+*.spec
-+-syntax spec
-+
-  THIRD SECTION: Named help screens:
- 
-  Use \i to turn on/off inverse video
 @@ -1154,6 +1158,7 @@
  home		^A
  home		^[ [ H
@@ -91,17 +58,6 @@
  execmd		^[ x		Prompt for command to execute
 --- rc/jstarrc.in
 +++ rc/jstarrc.in
-@@ -878,6 +878,10 @@
- -wordwrap
- -syntax mail
- 
-+ RPM spec file
-+*.spec
-+-syntax spec
-+
-  THIRD SECTION: Named help screens:
- 
-  Use \i to turn on/off inverse video
 @@ -1194,6 +1198,7 @@
  home		.kh		Goto beginning of line
  home		^[ [ H
@@ -120,17 +76,6 @@
  eol		^Q d
 --- rc/rjoerc.in
 +++ rc/rjoerc.in
-@@ -902,6 +902,10 @@
- -wordwrap
- -syntax mail
- 
-+ RPM spec file
-+*.spec
-+-syntax spec
-+
-  THIRD SECTION: Named help screens:
- 
-  Use \i to turn on/off inverse video
 @@ -1238,6 +1242,7 @@
  bol		^A
  bol		^[ [ H
diff --git a/joe-3.7-spec_association.patch b/joe-3.7-spec_association.patch
new file mode 100644
index 0000000..6c6991c
--- /dev/null
+++ b/joe-3.7-spec_association.patch
@@ -0,0 +1,12 @@
+--- rc/ftyperc
++++ rc/ftyperc
+@@ -753,3 +753,9 @@
+ *jpicorc.in
+ -syntax joerc
+ 
++*.spec
++-syntax spec
++
++*.spec.in
++-synatx spec
++
diff --git a/joe.changes b/joe.changes
index 3a71a57..5b331d0 100644
--- a/joe.changes
+++ b/joe.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jan 22 11:49:49 CET 2009 - pth@suse.de
+
+- Remove obsolete patch
+- Fix file list
+- Split and rename joe-3.0-rc.patch, move syntax mapping from j*rc
+  to ftyperc.
+
 -------------------------------------------------------------------
 Wed Jan 21 13:13:26 CET 2009 - pth@suse.de
 
diff --git a/joe.spec b/joe.spec
index 1bbc673..4a932a0 100644
--- a/joe.spec
+++ b/joe.spec
@@ -24,19 +24,19 @@ License:        GPL v2 or later
 Group:          Productivity/Editors/Other
 AutoReqProv:    on
 Version:        3.7
-Release:        1
+Release:        2
 Summary:        A Text Editor
 Url:            http://sourceforge.net/projects/joe-editor
 Source:         joe-%{version}.tar.bz2
 Source1:        lang_additions.tar.bz2
 Source2:        de.po
 Patch:          joe-3.1-terminate_buffer.patch
-Patch1:         joe-3.0-rc.patch
 Patch2:         joe-3.1-fix_isblanck_argument.patch
 Patch3:         joe-3.3-warnings.patch
-Patch4:         joe-3.5-fix_locale.patch
 Patch5:         joe-activate_po.patch
 Patch6:         joe-fr_trans.patch
+Patch7:         joe-3.7-additional_key_mappings.patch
+Patch8:         joe-3.7-spec_association.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -76,11 +76,11 @@ Authors:
 %prep
 %setup -q
 %patch
-%patch1
 %patch2
 %patch3
-%patch4
 %patch6
+%patch7
+%patch8
 gettextize -f
 tar -xvf %{S:1}
 %patch5
@@ -120,6 +120,9 @@ rm -rf %{buildroot}
 %config %{_sysconfdir}/joe/*
 %dir %{_sysconfdir}/joe
 %dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/lang
+%dir %{_mandir}/ru
+%dir %{_mandir}/ru/man1
 %{_bindir}/*
 %{_datadir}/%{name}/charmaps
 %{_datadir}/%{name}/syntax
@@ -130,6 +133,11 @@ rm -rf %{buildroot}
 %lang(uk) %{_datadir}/%{name}/lang/uk.mo
 
 %changelog
+* Thu Jan 22 2009 pth@suse.de
+- Remove obsolete patch
+- Fix file list
+- Split and rename joe-3.0-rc.patch, move syntax mapping from j*rc
+  to ftyperc.
 * Wed Jan 21 2009 pth@suse.de
 - Use gettext autoconf macros and makefiles.
 - Added complete germen translation.