diff --git a/fio/Makefile.patch b/fio/Makefile.patch
index 4d078a647..b3b47191e 100644
--- a/fio/Makefile.patch
+++ b/fio/Makefile.patch
@@ -1,20 +1,11 @@
---- src/Makefile2	2007-03-29 16:40:23.000000000 +0200
-+++ src/Makefile	2007-03-29 16:40:54.000000000 +0200
-@@ -2,7 +2,7 @@
- CC	= gcc -W
- DEBUGFLAGS = -D_FORTIFY_SOURCE=2
- OPTFLAGS= -O2 -g $(EXTFLAGS)
--CFLAGS	= -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(DEBUGFLAGS) -rdynamic
-+CFLAGS	+= -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(DEBUGFLAGS) -rdynamic
+--- src/Makefile2	2012-03-07 13:14:53.721251034 +0800
++++ src/Makefile	2012-03-07 13:15:03.189987595 +0800
+@@ -3,7 +3,7 @@
+ CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
+ 	$(DEBUGFLAGS)
+ OPTFLAGS= -O3 -fno-omit-frame-pointer -g $(EXTFLAGS)
+-CFLAGS	= -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS)
++CFLAGS	+= -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS)
+ LIBS	= -lm $(EXTLIBS)
  PROGS	= fio
  SCRIPTS = fio_generate_plots
- OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o \
-@@ -28,7 +28,7 @@ bindir = $(prefix)/bin
- all: $(PROGS) $(SCRIPTS)
- 
- fio: $(OBJS)
--	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm -ldl -laio -lrt
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm -ldl -laio -lrt
- 
- clean:
- 	-rm -f *.o .depend cscope.out $(PROGS) engines/*.o core.* core
diff --git a/fio/control b/fio/control
index 086647c72..5558f4a21 100644
--- a/fio/control
+++ b/fio/control
@@ -6,8 +6,8 @@ TEST_TYPE = "client"
 TIME = 'MEDIUM'
 EXPERIMENTAL = "True"
 DOC='''
-fio is an I/O tool meant to be used both for benchmark and stress/hardware 
-verification. This test runs the fio tool. Details can be found at : 
-http://freshmeat.net/projects/fio/
+fio is an I/O tool meant to be used both for benchmark and stress/hardware
+verification. This test runs the fio tool. Details can be found at :
+http://freecode.com/projects/fio
 '''
 job.run_test('fio')
diff --git a/fio/fio-1.16.5.tar.bz2 b/fio/fio-1.16.5.tar.bz2
deleted file mode 100644
index 68deab43f..000000000
Binary files a/fio/fio-1.16.5.tar.bz2 and /dev/null differ
diff --git a/fio/fio-2.0.5.tar.bz2 b/fio/fio-2.0.5.tar.bz2
new file mode 100644
index 000000000..fe2cf3910
Binary files /dev/null and b/fio/fio-2.0.5.tar.bz2 differ
diff --git a/fio/fio.py b/fio/fio.py
index 08ae5d33f..772eb266c 100644
--- a/fio/fio.py
+++ b/fio/fio.py
@@ -3,14 +3,23 @@
 
 
 class fio(test.test):
-    version = 2
+    """
+    fio is an I/O tool mean for benchmark and stress/hardware verification.
+
+    @see: http://freecode.com/projects/fio
+    """
+    version = 3
 
     def initialize(self):
         self.job.require_gcc()
 
 
-    # http://brick.kernel.dk/snaps/fio-1.16.5.tar.bz2
-    def setup(self, tarball = 'fio-1.16.5.tar.bz2'):
+    def setup(self, tarball = 'fio-2.0.5.tar.bz2'):
+        """
+        Compiles and installs fio.
+
+        @see: http://brick.kernel.dk/snaps/fio-2.0.5.tar.bz2
+        """
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)