diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 0aa360504d..790434d5db 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -39,12 +39,12 @@ module HomebrewEnvExtension
     # don't react properly to that.
     self['LD'] = self['CC']
 
-    # optimise all the way to eleven, references:
+    # Optimise all the way to eleven, references:
     # http://en.gentoo-wiki.com/wiki/Safe_Cflags/Intel
     # http://forums.mozillazine.org/viewtopic.php?f=12&t=577299
     # http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/i386-and-x86_002d64-Options.html
-    # we don't set, eg. -msse3 because the march flag does that for us
-    #   http://gcc.gnu.org/onlinedocs/gcc-4.3.3/gcc/i386-and-x86_002d64-Options.html
+    # We don't set, eg. -msse3 because the march flag does that for us:
+    # http://gcc.gnu.org/onlinedocs/gcc-4.3.3/gcc/i386-and-x86_002d64-Options.html
     if MACOS_VERSION >= 10.6
       case Hardware.intel_family
       when :nehalem, :penryn, :core2
@@ -206,10 +206,10 @@ Please take one of the following actions:
     # There are some config scripts (e.g. freetype) here that should go in the path
     prepend 'PATH', '/usr/X11/bin', ':'
     # CPPFLAGS are the C-PreProcessor flags, *not* C++!
-    append 'CPPFLAGS', '-I/usr/X11R6/include'
-    append 'LDFLAGS', '-L/usr/X11R6/lib'
+    append 'CPPFLAGS', '-I/usr/X11/include'
+    append 'LDFLAGS', '-L/usr/X11/lib'
     # CMake ignores the variables above
-    append 'CMAKE_PREFIX_PATH', '/usr/X11R6', ':'
+    append 'CMAKE_PREFIX_PATH', '/usr/X11', ':'
   end
   alias_method :libpng, :x11