diff --git a/waf-1.7.0pre3-encoding.patch b/waf-1.7.0pre3-encoding.patch
new file mode 100644
index 0000000..324d2dc
--- /dev/null
+++ b/waf-1.7.0pre3-encoding.patch
@@ -0,0 +1,13 @@
+diff --git a/wscript b/wscript
+index 24aec92..189b26b 100644
+--- a/wscript
++++ b/wscript
+@@ -141,7 +141,7 @@ def process_tokens(tokens):
+ 	line_buf = []
+ 
+ 	for (type, token, start, end, line) in tokens:
+-		token = token.replace('\r\n', '\n')
++		token = token.decode('utf-8').replace('\r\n', '\n')
+ 		if type == tokenize.NEWLINE:
+ 			if line_buf:
+ 				accu.append(indent * '\t')
diff --git a/waf.spec b/waf.spec
index 2cbd32c..504411d 100644
--- a/waf.spec
+++ b/waf.spec
@@ -29,6 +29,7 @@ Source:         waf-%{version}%{?prerel}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
 Patch0:         waf-1.6.2-libdir.patch
 Patch1:         waf-1.6.9-logo.patch
+Patch2:         waf-1.7.0pre3-encoding.patch
 
 BuildArch:      noarch
 
@@ -108,12 +109,11 @@ This package contains the HTML documentation for %{name}.
 %patch0 -p0
 # do not try to use the (removed) waf logos
 %patch1 -p1
+# fix for http://code.google.com/p/waf/issues/detail?id=1171
+%patch2 -p1
 
 
 %build
-# ticgt trips up build, see 
-# http://code.google.com/p/waf/issues/detail?id=1171
-mv waflib/extras/ticgt.py{,.off}
 extras=
 for f in waflib/extras/*.py ; do
   f=$(basename "$f" .py);
@@ -211,6 +211,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Thu Jun  7 2012 Thomas Moschny <thomas.moschny@gmx.de> - 1.7.0-0.2.pre3
+- Add patch for waf issue #1171.
 - Spec file fixes.
 
 * Thu Jun  7 2012 Michel Salim <salimma@fedoraproject.org> - 1.7.0-0.1.pre3