diff --git a/ChangeLog b/ChangeLog
index 214b383..f17eb36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
    clobber
  - (tim) openbsd-compat/xmmap.[ch] License clarifications. Add missing
    CVS ID.
+ - (djm) Remove "noip6" option from RedHat spec file. This may now be 
+   set at runtime using AddressFamily option.
 
 20030530
  - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at
@@ -1630,4 +1632,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2757 2003/06/02 02:25:27 tim Exp $
+$Id: ChangeLog,v 1.2758 2003/06/02 07:43:19 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 623cfa6..656e692 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,5 +1,5 @@
 %define ver 3.6.1p2
-%define rel 2
+%define rel 3
 
 # OpenSSH privilege separation requires a user & group ID
 %define sshd_uid    74
@@ -26,9 +26,6 @@
 # Is this build for RHL 6.x?
 %define build6x 0
 
-# Disable IPv6 (avoids DNS hangs on some glibc versions)
-%define noip6 0
-
 # Do we want kerberos5 support (1=yes 0=no)
 %define kerberos5 1
 
@@ -43,7 +40,6 @@
 # If this is RHL 6.x, the default configuration has sysconfdir in /usr/etc.
 %if %{build6x}
 %define _sysconfdir /etc
-%define noip6 1
 %endif
 
 # Options for static OpenSSL link:
@@ -54,10 +50,6 @@
 # rpm -ba|--rebuild --define "smartcard 1"
 %{?smartcard:%define scard 1}
 
-# Option to disable ipv6
-# rpm -ba|--rebuild --define "noipv6 1"
-%{?noipv6:%define noip6 1}
-
 # Is this a build for the rescue CD (without PAM, with MD5)? (1=yes 0=no)
 %define rescue 0
 %{?build_rescue:%define rescue 1}
@@ -196,9 +188,6 @@
 %if %{scard}
 	--with-smartcard \
 %endif
-%if %{noip6}
-	--with-ipv4-default \
-%endif
 %if %{rescue}
 	--without-pam --with-md5-passwords \
 %else
@@ -402,6 +391,10 @@
 %endif
 
 %changelog
+* Mon Jun 2 2003 Damien Miller <djm@mindrot.org>
+- Remove noip6 option. This may be controlled at run-time in client config 
+  file using new AddressFamily directive
+
 * Mon May 12 2003 Damien Miller <djm@mindrot.org>
 - Don't install profile.d scripts when not building with GNOME/GTK askpass
   (patch from bet@rahul.net)