diff --git a/general.ent b/general.ent
index ab85fd8eb1..37271485c1 100644
--- a/general.ent
+++ b/general.ent
@@ -604,7 +604,7 @@ $Date$
 <!ENTITY libfame-version              "0.9.1">
 <!ENTITY speex-version                "1.0.5">
 <!ENTITY id3lib-version               "3.8.3">
-<!ENTITY flac-version                 "1.1.2">
+<!ENTITY flac-version                 "1.1.4">
 <!ENTITY libdvdcss-version            "1.2.9">
 <!ENTITY libdvdread-version           "0.9.6">
 <!ENTITY libdv-version                "1.0.0">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index abb272f7b5..d2d9d74c61 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>July 19th, 2007</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to FLAC-1.1.4.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated to GStreamer Good Plug-ins-0.10.6.</para>
         </listitem>
diff --git a/multimedia/libdriv/flac.xml b/multimedia/libdriv/flac.xml
index 37cb88a8bb..1baac74b51 100644
--- a/multimedia/libdriv/flac.xml
+++ b/multimedia/libdriv/flac.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY flac-download-http "http://downloads.sourceforge.net/flac/flac-&flac-version;.tar.gz">
   <!ENTITY flac-download-ftp  " ">
-  <!ENTITY flac-md5sum        "2bfc127cdda02834d0491ab531a20960">
-  <!ENTITY flac-size          "1.5 MB">
-  <!ENTITY flac-buildsize     "49 MB">
-  <!ENTITY flac-time          "0.7 SBU">
+  <!ENTITY flac-md5sum        "3958cbd5b6ed8c14966792538e44223b">
+  <!ENTITY flac-size          "1.8 MB">
+  <!ENTITY flac-buildsize     "136 MB (includes running the test suite)">
+  <!ENTITY flac-time          "0.6 SBU (additional 1.8 SBU to run the test suite)">
 ]>
 
 <sect1 id="flac" xreflabel="FLAC-&flac-version;">
@@ -55,13 +55,13 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>Required patch: <ulink
         url="&patch-root;/flac-&flac-version;-xmms_plugin_fix-1.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <bridgehead renderas="sect3">FLAC Dependencies</bridgehead>
 
@@ -84,8 +84,8 @@
     <para>Install <application>FLAC</application> by running the
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../flac-&flac-version;-xmms_plugin_fix-1.patch &amp;&amp;
-LIBS=-lm ./configure --prefix=/usr &amp;&amp;
+<screen><userinput>sed -i 's/^FLaC__INLINE/static\n&amp;/' src/libFLAC/md5.c &amp;&amp;
+./configure --prefix=/usr --disable-thorough-tests &amp;&amp;
 make</userinput></screen>
 
     <para>If you have <application>Valgrind</application> version 3.0.0 or
@@ -96,9 +96,8 @@ make</userinput></screen>
 
 <screen><userinput>sed -i -e "s/logfile-fd/log-fd/" `grep -lr logfile-fd test/*sh`</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. This
-    test suite will take quite a while. Note that if you passed the
-    <option>--enable-exhaustive-tests</option> and
+    <para>To test the results, issue: <command>make check</command>. Note that
+    if you passed the <option>--enable-exhaustive-tests</option> and
     <option>--enable-valgrind-testing</option> parameters to
     <command>configure</command> and then run the test suite, it will take a
     <emphasis>very</emphasis> long time (up to 300 SBUs) and use about 375 MB
@@ -113,11 +112,18 @@ make</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>LIBS=-lm ./configure --prefix=/usr</command>:
+    <!-- <para><command>LIBS=-lm ./configure -prefix=/usr</command>:
     <filename class="libraryfile">libFLAC</filename> uses a function from the math
     library but is not linked with <filename class="libraryfile">libm</filename>.
     Passing the environment variable to <command>configure</command> satisfies
-    this dependency.</para>
+    this dependency.</para> -->
+
+    <para><command>sed -i 's/.../' src/libFLAC/md5.c</command>: This command
+    is used so that the byteswap symbol is not global.</para>
+
+    <para><parameter>--disable-thorough-tests</parameter>: This parameter is
+    used so that the test suite will complete in a reasonable amount of time.
+    Remove it if you desire more extensive tests.</para>
 
     <para><option>--enable-sse</option>: This option is off by default and
     should be set on if your machine has SSE capability. One way to find out if
@@ -136,9 +142,9 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>flac and metaflac</seg>
-        <seg>libFLAC.{so,a}, libFLAC++.{so,a}, libOggFLAC.{so,a},
-        libOggFLAC++.{so,a}, and libxmms-flac.{so,a}</seg>
-        <seg>/usr/share/doc/flac-&flac-version;</seg>
+        <seg>libFLAC.{so,a}, libFLAC++.{so,a} and libxmms-flac.{so,a}</seg>
+        <seg>/usr/include/FLAC, /usr/include/FLAC++ and
+        /usr/share/doc/flac-&flac-version;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -170,7 +176,7 @@ make</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libflac">
-        <term><filename class='libraryfile'>lib{,Ogg}FLAC{,++}.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libFLAC{,++}.{so,a}</filename></term>
         <listitem>
           <para>these libraries provide native FLAC and Ogg FLAC C/C++ APIs
           for programs utilizing FLAC.</para>