diff --git a/licenses_changes.txt b/licenses_changes.txt
index a366bac..3fb2c91 100644
--- a/licenses_changes.txt
+++ b/licenses_changes.txt
@@ -411,13 +411,6 @@ MIT	MIT-Licence
 MIT	MIT license
 MIT	MIT License
 MIT	MIT License (or similar)
-MIT	MIT/X11
-MIT	MIT/X Consortium License
-MIT	MIT/X License
-MIT	X11
-MIT	X11 (BSD like)
-MIT	X11 MIT
-MIT	X11/MIT
 Motosoto+	Motosoto+
 Motosoto	Motosoto
 MPL-1.0+	MPL-1.0+
@@ -657,10 +650,10 @@ SUSE-Vim	SUSE-Vim
 SUSE-WTFPL-2.0	http://sam.zoy.org/wtfpl/
 SUSE-Xano	https://fedoraproject.org/wiki/Licensing/MinchoFontLicense
 SUSE-Xenonsoft-1.00	http://pastebin.com/PkSpfTbr (part of spectcl)
-SUSE-XFree86-1.0	The old version of the XFree86 license is not upstream at SPDX.org
 SUSE-XFree86-with-font-exception	XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license
 SUSE-xinetd	Xinedt license (Fedora also uses a custom license here)
 SUSE-XSL-Lint	http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets)
+SUSE-OldFSFDocLicense	Tracked by Fedora as OldFSFDocLicense (see https://fedoraproject.org/wiki/Licensing:OldFSFDocLicense?rd=Licensing/OldFSFDocLicense)
 VSL-1.0+	VSL-1.0+
 VSL-1.0	VSL-1.0
 W3C+	W3C+
@@ -672,8 +665,15 @@ WTFPL+	WTFPL+
 WTFPL	WTFPL
 WXwindows+	WXwindows+
 WXwindows	WXwindows
+X11	MIT/X11
+X11	MIT/X Consortium License
+X11	MIT/X License
+X11	SUSE-XFree86-1.0
 X11+	X11+
 X11	X11
+X11	X11 (BSD like)
+X11	X11 MIT
+X11	X11/MIT
 XFree86-1.1+	XFree86-1.1+
 XFree86-1.1	XFree86-1.1
 Xnet+	Xnet+
diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes
index ebb149e..c7ec216 100644
--- a/obs-service-format_spec_file.changes
+++ b/obs-service-format_spec_file.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jan 25 09:30:32 UTC 2013 - coolo@suse.com
+
+- official fix for the X11 license
+
+-------------------------------------------------------------------
+Fri Jan 25 08:03:19 UTC 2013 - adrian@suse.de
+
+- drop double definition of X11 license
+- add basic self check on building package
+
 -------------------------------------------------------------------
 Thu Jan 24 06:11:18 UTC 2013 - coolo@suse.com
 
diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec
index 23aae5c..dbb66aa 100644
--- a/obs-service-format_spec_file.spec
+++ b/obs-service-format_spec_file.spec
@@ -30,7 +30,7 @@ Source3:        patch_license
 Source4:        licenses_changes.txt
 Source5:        fetch-licenses.sh
 Source100:      COPYING
-Requires:       osc-source_validator
+Requires:       obs-service-source_validator
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -57,6 +57,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service
 install -m 0755 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files
 install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files
 
+%check
+perl %{SOURCE2} %_topdir/SOURCES/%name.spec
+
 %files
 %defattr(-,root,root)
 %doc COPYING