diff --git a/texlive-filesystem.spec b/texlive-filesystem.spec
index 943448f..fc613ab 100644
--- a/texlive-filesystem.spec
+++ b/texlive-filesystem.spec
@@ -17,7 +17,7 @@
 
 %define texlive_version 2012
 %define texlive_release 20120611
-%define texlive_noarch  40
+%define texlive_noarch  41
 %define texlive_source  texlive-20120611-source
 
 %define __perl_requires		%{nil}
diff --git a/texlive.spec b/texlive.spec
index 525ac57..ac9338f 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -17,7 +17,7 @@
 
 %define texlive_version 2012
 %define texlive_release 20120611
-%define texlive_noarch  40
+%define texlive_noarch  41
 %define texlive_source  texlive-20120611-source
 
 %define __perl_requires		%{nil}
@@ -166,8 +166,6 @@ Source30:       texlive-rpmlintrc
 Source31:       dot.dvipsrc
 Source50:       public.c
 Source51:       public.8
-# Download at ftp://ftp.ctan.org/pub/tex/systems/texlive/tlnet/archive/
-# from 20120611
 Patch0:         source.dif
 Patch1:         source-configure.dif
 Patch2:         source-xdvizilla.dif
@@ -1316,18 +1314,6 @@ Prefix: %{_bindir}
 %description perltex-bin
 Binary files of perltex
 
-%package pkfix-bin
-Version: %{texlive_version}.%{texlive_release}.svn13364
-Release: 0
-License: LPPL-1.0
-Summary: Binary files of pkfix
-Group: Productivity/Publishing/TeX/Utilities
-Url: http://www.tug.org/texlive/
-Prefix: %{_bindir}
-
-%description pkfix-bin
-Binary files of pkfix
-
 %package pkfix-helper-bin
 Version: %{texlive_version}.%{texlive_release}.svn13663
 Release: 0
@@ -1340,6 +1326,18 @@ Prefix: %{_bindir}
 %description pkfix-helper-bin
 Binary files of pkfix-helper
 
+%package pkfix-bin
+Version: %{texlive_version}.%{texlive_release}.svn13364
+Release: 0
+License: LPPL-1.0
+Summary: Binary files of pkfix
+Group: Productivity/Publishing/TeX/Utilities
+Url: http://www.tug.org/texlive/
+Prefix: %{_bindir}
+
+%description pkfix-bin
+Binary files of pkfix
+
 %package ps2pkm-bin
 Version: %{texlive_version}.%{texlive_release}.svn22981
 Release: 0
@@ -2320,13 +2318,6 @@ development packages for TeXLive.
     mkdir -p %{buildroot}%{_fontcache}/tfm
     mkdir -p %{buildroot}%{_appdefdir}
 
-    mkdir -p %{buildroot}%{_datadir}/texlive
-    ln -sf ../../share/texmf %{buildroot}%{_datadir}/texlive/texmf-dist
-    ln -sf ../../lib/texmf   %{buildroot}%{_datadir}/texlive/texmf
-    rm -v  %{buildroot}%{_datadir}/texlive/texmf
-    rm -v  %{buildroot}%{_datadir}/texlive/texmf-dist
-    rm -vr %{buildroot}%{_datadir}/texlive
-
     pushd ${prefix}/bin/
 	tar -cspSf - . | tar -xvspSf - -C %{buildroot}%{_bindir}/
 	rm -vf %{buildroot}%{_bindir}/tlmgr
@@ -3013,14 +3004,14 @@ fi
 %defattr(-,root,root,755)
 %{_bindir}/perltex
 
-%files pkfix-bin
-%defattr(-,root,root,755)
-%{_bindir}/pkfix
-
 %files pkfix-helper-bin
 %defattr(-,root,root,755)
 %{_bindir}/pkfix-helper
 
+%files pkfix-bin
+%defattr(-,root,root,755)
+%{_bindir}/pkfix
+
 %files ps2pkm-bin
 %defattr(-,root,root,755)
 %{_bindir}/mag