diff --git a/CheckFilelist.py b/CheckFilelist.py
index 16fae21..1069143 100644
--- a/CheckFilelist.py
+++ b/CheckFilelist.py
@@ -90,7 +90,22 @@ _restricteddirs = set()
 
 _checks = [
         {
-            # TODO: split this into several checks
+            'bad': [
+                '*/.xvpics',
+                '*.orig',
+                '*.orig.gz',
+                '/usr/share/*/.libs*',
+                '/usr/share/*/.deps*',
+                '/var/adm/setup',
+                '/etc/httpd/*',
+                '/etc/init.d/*/*',
+                '/usr/share/locale/LC_MESSAGES',
+                ],
+            },
+        {
+            'error': 'suse-filelist-forbidden-sysconfig',
+            'details': '''Please use /var/adm/fillup-templates/sysconfig.<packagename>
+                        and call %fillup_and_insserv to install new sysconfig files''',
             'good': [
                 '/etc/sysconfig/cbq',
                 '/etc/sysconfig/scripts',
@@ -107,27 +122,11 @@ _checks = [
                 '/etc/sysconfig/uml',
                 ],
             'bad': [
-                '*/CVS',
-                '*/CVS/*',
-                '*/.cvsignore',
-                '*/.svn',
-                '*/RCS',
-                '*/RCS/*',
-                '*,v',
-                '*/.xvpics',
-                '*.orig',
-                '*.orig.gz',
-                '/usr/share/*/.libs*',
-                '/usr/share/*/.deps*',
                 '/var/adm/fillup-templates/rc.config.*',
-                '/var/adm/setup',
-                '/etc/httpd/*',
                 '/etc/sysconfig/*',
                 '/etc/rc.config.d/*',
-                '/etc/init.d/*/*',
-                '/usr/share/locale/LC_MESSAGES',
                 ],
-            },
+        },
         {
             'error': 'suse-filelist-forbidden-perl-dir',
             'details': '''perl files installed a non-vendor installed path, 
diff --git a/rpmlint.changes b/rpmlint.changes
index 747b1ed..4fe5782 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb 26 11:11:54 CET 2009 - lnussel@suse.de
+
+- use separate error for sysconfig stuff (bnc#470965)
+- move RCS detection to FilesCheck.py
+- remove explicit requires on python, already handled by %py_requires
+
 -------------------------------------------------------------------
 Mon Feb  9 15:49:49 CET 2009 - lnussel@suse.de
 
diff --git a/rpmlint.spec b/rpmlint.spec
index dd1867f..89facfa 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -22,7 +22,7 @@ Name:           rpmlint
 BuildRequires:  rpm-python
 Summary:        Rpm correctness checker
 Version:        0.84
-Release:        15
+Release:        17
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        config
 Source1001:     config.in
@@ -48,7 +48,7 @@ Url:            http://rpmlint.zarb.org/
 License:        GPL v2 or later
 Group:          System/Packages
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       rpm-python, python, binutils, file, findutils, cpio, grep, bash
+Requires:       rpm-python, binutils, file, findutils, cpio, grep, bash
 Requires:       desktop-file-utils
 BuildArch:      noarch
 Patch0:         rpmlint-suse.diff
@@ -107,6 +107,7 @@ Patch68:        more-verbose-lsb-check.diff
 Patch69:        useless-requires-doc.diff
 Patch70:        subprocess-support.diff
 Patch71:        suse-binary-info-compile-opts.diff
+Patch72:        version-control-internal-file.diff
 %py_requires
 
 %description
@@ -178,6 +179,7 @@ Authors:
 %patch69
 %patch70
 %patch71
+%patch72 -p1
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -222,6 +224,10 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man1/rpmlint.1.gz
 
 %changelog
+* Thu Feb 26 2009 lnussel@suse.de
+- use separate error for sysconfig stuff (bnc#470965)
+- move RCS detection to FilesCheck.py
+- remove explicit requires on python, already handled by %%py_requires
 * Mon Feb 09 2009 lnussel@suse.de
 - remove check for /usr/share/info/dir from CheckFilelist.py,
   already in upstream FilesCheck.py
diff --git a/version-control-internal-file.diff b/version-control-internal-file.diff
new file mode 100644
index 0000000..873f141
--- /dev/null
+++ b/version-control-internal-file.diff
@@ -0,0 +1,14 @@
+also detect RCS files
+Index: rpmlint-0.84/FilesCheck.py
+===================================================================
+--- rpmlint-0.84.orig/FilesCheck.py
++++ rpmlint-0.84/FilesCheck.py
+@@ -655,7 +655,7 @@ ldconfig_regex=re.compile('^[^#]*ldconfi
+ depmod_regex=re.compile('^[^#]*depmod', re.MULTILINE)
+ install_info_regex=re.compile('^[^#]*install-info', re.MULTILINE)
+ perl_temp_file=re.compile('.*perl.*/(\.packlist|perllocal\.pod)$')
+-scm_regex=re.compile('/CVS/[^/]+$|/\.(cvs|git|hg)ignore$|/\.hgtags$|/\.(git|hg|svn)/|/(\.arch-ids|{arch})/')
++scm_regex=re.compile('/(CVS|RCS)(/[^/]+)?$|/\.(cvs|git|hg)ignore$|/\.hgtags$|/\.(git|hg|svn)/|/(\.arch-ids|{arch})/|,v$')
+ htaccess_regex=re.compile('\.htaccess$')
+ games_path_regex=re.compile('^/usr(/lib(64)?)?/games/')
+ games_group_regex=re.compile(Config.getOption('RpmGamesGroups', DEFAULT_GAMES_GROUPS))