diff --git a/root-proofx-link-iolib.patch b/root-proofx-link-iolib.patch
new file mode 100644
index 0000000..ca06b61
--- /dev/null
+++ b/root-proofx-link-iolib.patch
@@ -0,0 +1,31 @@
+diff -ur root-5.34.18.orig/config/Makefile.depend root-5.34.18/config/Makefile.depend
+--- root-5.34.18.orig/config/Makefile.depend	2014-03-14 16:21:52.000000000 +0100
++++ root-5.34.18/config/Makefile.depend	2014-05-04 07:52:08.144211940 +0200
+@@ -38,7 +38,7 @@
+                          $(THREADLIB) $(MATHCORELIB)
+ PROOFDRAWLIBDEPM       = $(TREEPLAYERLIB) $(G3DLIB) $(GRAFLIB) $(GPADLIB) \
+                          $(PROOFPLAYERLIB) $(HISTLIB) $(TREELIB) $(PROOFLIB)
+-PROOFXLIBDEPM          = $(NETLIB) $(PROOFLIB) $(THREADLIB)
++PROOFXLIBDEPM          = $(NETLIB) $(PROOFLIB) $(THREADLIB) $(IOLIB)
+ PROOFBENCHLIBDEPM      = $(PROOFLIB) $(PROOFDRAWLIB) $(PROOFPLAYERLIB) \
+                          $(TREELIB) $(GRAFLIB) $(HISTLIB) $(GPADLIB) $(IOLIB)
+ SESSIONVIEWERLIBDEPM   = $(PROOFLIB) $(GUILIB) $(HISTLIB) $(GPADLIB) \
+@@ -291,7 +291,8 @@
+                           lib/libGraf.lib lib/libGpad.lib \
+                           lib/libProofPlayer.lib lib/libHist.lib \
+                           lib/libTree.lib lib/libProof.lib
+-PROOFXLIBEXTRA          = lib/libNet.lib lib/libProof.lib lib/libThread.lib
++PROOFXLIBEXTRA          = lib/libNet.lib lib/libProof.lib lib/libThread.lib \
++                          lib/libRIO.lib
+ PROOFBENCHLIBEXTRA      = lib/libProof.lib lib/libProofDraw.lib \
+                           lib/libProofPlayer.lib lib/libTree.lib lib/libGraf.lib \
+                           lib/libHist.lib lib/libGpad.lib lib/libRIO.lib
+@@ -448,7 +449,7 @@
+                           -lMathCore
+ PROOFDRAWLIBEXTRA       = -Llib -lTreePlayer -lGraf3d -lGraf -lGpad \
+                           -lProofPlayer -lHist -lTree -lProof
+-PROOFXLIBEXTRA          = -Llib -lNet -lProof -lThread
++PROOFXLIBEXTRA          = -Llib -lNet -lProof -lThread -lRIO
+ PROOFBENCHLIBEXTRA      = -Llib -lProof -lProofDraw -lProofPlayer -lTree \
+                           -lGraf -lHist -lGpad -lRIO
+ SESSIONVIEWERLIBEXTRA   = -Llib -lProof -lGui -lHist -lGpad -lGraf -lTree \
diff --git a/root.spec b/root.spec
index a5dbd2b..b4c7d8d 100644
--- a/root.spec
+++ b/root.spec
@@ -34,7 +34,7 @@
 Name:		root
 Version:	5.34.18
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -80,6 +80,8 @@ Patch9:		%{name}-dont-link-jvm.patch
 Patch10:	%{name}-bsd-misc.patch
 #		Use GFAL2
 Patch11:	%{name}-gfal2.patch
+#		Link failure on Fedora 21
+Patch12:	%{name}-proofx-link-iolib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #		The build segfaults on ppc64 during an invocation of cint:
 #		https://savannah.cern.ch/bugs/index.php?70542
@@ -147,7 +149,7 @@ BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.2.8
 BuildRequires:	gfal2-devel
 BuildRequires:	srm-ifce-devel
-%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} >= 20
 BuildRequires:	hadoop-devel
 %endif
 BuildRequires:	emacs
@@ -1174,6 +1176,7 @@ fi
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 find . '(' -name '*.cxx' -o -name '*.cpp' -o -name '*.C' -o -name '*.c' -o \
 	   -name '*.h' -o -name '*.hh' -o -name '*.hi' -o -name '*.py' -o \
@@ -2405,6 +2408,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sun May 04 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-2
+- Rebuild for ruby 2.1
+- Fix build failure on F21 (missing symbol in libProofx linking)
+
 * Sat Mar 22 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.18-1
 - Update to 5.34.18
 - Build GFAL module using libgfal2