diff --git a/apache2/apache2.spec b/apache2/apache2.spec
index 9e7f57fab2..fc8ac5a7f9 100644
--- a/apache2/apache2.spec
+++ b/apache2/apache2.spec
@@ -34,7 +34,7 @@ Class:        PLUS
 Group:        Web
 License:      ASF
 Version:      2.0.48
-Release:      20040203
+Release:      20040206
 
 #   list of sources
 Source0:      http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -61,11 +61,6 @@ Conflicts:    apache, apr
     of users have contributed ideas, code, and documentation to the
     project.
 
-    WARNING! This is version 2.0 of Apache, a completely overhauled version
-    of the Apache HTTP server. Although it is mostly Apache 1.3 compatible,
-    it is not a direct drop-in replacement. This software won't be released
-    by OpenPKG (it is EVAL) until it is fit for use on production machines.
-
 %track
     prog apache2 = {
         version   = 2.0.48
@@ -76,6 +71,12 @@ Conflicts:    apache, apr
 %prep
     %setup -q -n httpd-%{version}
     %patch -p0
+    %{l_shtool} subst \
+        -e 's;^\(PROGRAM_LDADD.*$\);\1 -liconv;' \
+        Makefile.in support/Makefile.in
+    %{l_shtool} subst \
+        -e 's;^\(APRUTIL_LIBS.*$\);\1 -liconv;' \
+        srclib/apr-util/Makefile
 
 %build
     CC="%{l_cc}" \