--- tex/generic/pgf/math/pgfmathutil.code.tex
+++ tex/generic/pgf/math/pgfmathutil.code.tex	2012-07-12 08:52:20.220509841 +0000
@@ -80,7 +80,7 @@
 \let\pgfmath@yc\pgf@yc
 
 \let\pgfmath@tempdima\pgfutil@tempdima
-\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempdimb\pgfutil@tempdimb
 
 \let\c@pgfmath@counta\c@pgf@counta
 \let\c@pgfmath@countb\c@pgf@countb
--- tex/generic/pgf/utilities/pgfutil-latex.def
+++ tex/generic/pgf/utilities/pgfutil-latex.def	2012-07-12 08:54:56.028009931 +0000
@@ -62,7 +62,12 @@
 \let\pgfutil@tempdima=\@tempdima
 \let\pgfutil@tempdimb=\@tempdimb
 
-\AtEndDocument{\the\pgfutil@everybye}
+\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempcnta\pgfutil@tempcnta
+\let\pgfmath@tempcntb\pgfutil@tempcntb
+
+\AtEndDocument{\par\vfil\penalty-10000\relax\the\pgfutil@everybye}
 
 \def\pgfutil@insertatbegincurrentpagefrombox#1{%
   \global\setbox\pgfutil@abb\hbox{\unhbox\pgfutil@abb#1}%
--- tex/generic/pgf/utilities/pgfutil-plain.def
+++ tex/generic/pgf/utilities/pgfutil-plain.def	2012-07-12 08:56:55.316010210 +0000
@@ -209,6 +209,14 @@
 \newdimen\pgfutil@tempdima
 \newdimen\pgfutil@tempdimb
 
+\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempcnta\pgfutil@tempcnta
+\let\pgfmath@tempcntb\pgfutil@tempcntb
+
+% From LaTeX
+\newskip\pgfutil@flushglue
+\pgfutil@flushglue=0pt plus 1fil
 
 % Module stuff
 
@@ -228,8 +236,7 @@
 
 
 
-% Hack shipout. Should perhaps use atbegshi? Not in standard distribution, currently... 
-% Code inspired (but patched...) from everyshi.sty:
+% Hack shipout. Now use atbegshi
 
 \def\pgfutil@insertatbegincurrentpagefrombox#1{%
   \global\setbox\pgfutil@abb\hbox{\unhbox\pgfutil@abb#1}%
@@ -244,32 +251,27 @@
 }
 \let\pgfutil@abe\pgfutil@empty%
 
-\def\pgfutil@@EveryShipout@Shipout{%
-  \afterassignment\pgfutil@@EveryShipout@Test
-  \setbox255= %
-}
-\def\pgfutil@@EveryShipout@Test{%
-  \ifvoid\@cclv\relax
-    \aftergroup\pgfutil@EveryShipout@Output
-  \else
-    \pgfutil@EveryShipout@Output
-  \fi%
-}
-\def\pgfutil@EveryShipout@Output{%
-  \setbox255=\vbox{%
-    \setbox0=\hbox{\pgfutil@abe\unhbox\pgfutil@abb\pgfutil@abc\global\let\pgfutil@abc\pgfutil@empty}%
-    \wd0=0pt%
-    \ht0=0pt%
-    \dp0=0pt%
-    \box0%
-    \unvbox255%
-  }%
-  \pgfutil@@EveryShipout@Org@Shipout\box\@cclv%
-}
-\let\pgfutil@@EveryShipout@Org@Shipout\shipout
-\let\shipout\pgfutil@@EveryShipout@Shipout
-
-
+% Code by Heiko Oberdiek on ctt
+\input atbegshi.sty\relax 
+\AtBeginShipout{% 
+  \setbox\AtBeginShipoutBox=\vbox{% 
+    \setbox0=\hbox{% 
+      \begingroup   
+        \pgfutil@abe 
+        \unhbox\pgfutil@abb 
+        \pgfutil@abc 
+        \global\let\pgfutil@abc\pgfutil@empty 
+      \endgroup 
+    }% 
+    \wd0=0pt\relax 
+    \ht0=0pt\relax 
+    \dp0=0pt\relax 
+    \box0 % 
+    \nointerlineskip 
+    \box\AtBeginShipoutBox 
+  }% 
+}% 
+% End of HO code
 
 % The following is still messy and needs to be cleanup up (everything
 % prefixed by pgfutil@): 
--- tex/latex/pgf/math/pgfmath.sty
+++ tex/latex/pgf/math/pgfmath.sty	2012-07-12 08:58:15.052010130 +0000
@@ -7,6 +7,7 @@
 %
 % See the file doc/generic/pgf/licenses/LICENSE for more details.
 
+\RequirePackage{pgfrcs,pgfkeys}
 \input{pgfmath.code.tex}
 
 \endinput
--- tex/latex/pgf/utilities/pgffor.sty
+++ tex/latex/pgf/utilities/pgffor.sty	2012-07-12 08:58:34.616510234 +0000
@@ -9,6 +9,7 @@
 
 \RequirePackage{pgfrcs}
 \RequirePackage{pgfkeys}
+\RequirePackage{pgfmath}
 
 \input{pgffor.code.tex}