diff --git a/389-ds-base.spec b/389-ds-base.spec
index fa5cf39..7a496ae 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -9,6 +9,8 @@
 
 %global use_openldap 1
 %global use_db4 1
+# If perl-Socket-2.000 or newer is available, set 0 to use_Socket6.
+%global use_Socket6 0
 
 # fedora 15 and later uses tmpfiles.d
 # otherwise, comment this out
@@ -20,7 +22,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.10.4
-Release:          %{?relprefix}3%{?prerel}%{?dist}
+Release:          %{?relprefix}4%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -47,6 +49,7 @@ BuildRequires:    cyrus-sasl-devel
 BuildRequires:    icu
 BuildRequires:    libicu-devel
 BuildRequires:    pcre-devel
+BuildRequires:    gcc-c++
 # The following are needed to build the snmp ldap-agent
 BuildRequires:    net-snmp-devel
 %ifnarch sparc sparc64 ppc ppc64 s390 s390x
@@ -97,7 +100,11 @@ Requires(preun):  systemd-units
 Requires(postun): systemd-units
 
 # for setup-ds.pl to support ipv6 
-Requires:         perl-Socket-GetAddrInfo
+%if %{use_Socket6}
+Requires:         perl-Socket6
+%else
+Requires:         perl-Socket
+%endif
 Requires:         perl-NetAddr-IP
 
 Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
@@ -302,6 +309,10 @@ fi
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Tue Mar 27 2012 Noriko Hosoi <nhosoi@redhat.com> - 1.2.10.4-4
+- Ticket #46 - (revised) setup-ds-admin.pl does not like ipv6 only hostnames
+- Ticket #66 - 389-ds-base spec file does not have a BuildRequires on gcc-c++
+
 * Fri Mar 23 2012 Noriko Hosoi <nhosoi@redhat.com> - 1.2.10.4-3
 - Ticket #46 - setup-ds-admin.pl does not like ipv6 only hostnames