diff --git a/ocaml-ocamlnet.spec b/ocaml-ocamlnet.spec
index 2612016..e6c27a1 100644
--- a/ocaml-ocamlnet.spec
+++ b/ocaml-ocamlnet.spec
@@ -11,7 +11,7 @@
 
 Name:           ocaml-ocamlnet
 Version:        4.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Network protocols for OCaml
 License:        BSD
 
@@ -24,9 +24,12 @@ BuildRequires:  ocaml >= 3.12.1-3
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-findlib-devel
-BuildRequires:  ocaml-pcre-devel
 BuildRequires:  ocaml-lablgtk-devel
 BuildRequires:  ocaml-labltk-devel
+BuildRequires:  ocaml-pcre-devel
+BuildRequires:  ocaml-zip-devel
+BuildRequires:  gnutls-devel
+BuildRequires:  krb5-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  tcl-devel
 
@@ -69,6 +72,10 @@ In detail, the following features are available:
 
  * netsys contains bindings for system functions missing in core OCaml.
 
+ * netsmtp and netpop are client implementations of the SMTP and POP3
+   protocols.
+
+ * Bindings for GnuTLS and GSSAPI (TLS/HTTPS support).
 
 %package        devel
 Summary:        Development files for %{name}
@@ -111,15 +118,17 @@ files for developing applications that use %{name}-nethttpd.
 # Parallel builds don't work:
 unset MAKEFLAGS
 
-./configure -enable-tcl -with-nethttpd \
+./configure \
   -bindir %{_bindir} \
   -datadir %{_datadir}/%{name} \
-  -prefer-netcgi2 \
-  -with-nethttpd \
   -disable-apache \
-  -enable-gtk2
-# In future:
-# -with-rpc-auth-dh (requires cryptgps)
+  -enable-pcre \
+  -enable-gtk2 \
+  -enable-gnutls \
+  -enable-gssapi \
+  -enable-nethttpd \
+  -enable-tcl \
+  -enable-zip
 
 make all
 %if %opt
@@ -152,12 +161,16 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
 %{_libdir}/ocaml/netcgi2
 %{_libdir}/ocaml/netcgi2-plex
 %{_libdir}/ocaml/netclient
+%{_libdir}/ocaml/netgss-system
 %{_libdir}/ocaml/netmulticore
 %{_libdir}/ocaml/netplex
 %{_libdir}/ocaml/netshm
 %{_libdir}/ocaml/netstring
+%{_libdir}/ocaml/netstring-pcre
 %{_libdir}/ocaml/netsys
+%{_libdir}/ocaml/nettls-gnutls
 %{_libdir}/ocaml/netunidata
+%{_libdir}/ocaml/netzip
 %{_libdir}/ocaml/rpc
 %{_libdir}/ocaml/rpc-auth-local
 %{_libdir}/ocaml/rpc-generator
@@ -208,6 +221,15 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
 
 
 %changelog
+* Wed Feb 18 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.1-2
+- Enable more features, readding features disabled in the previous commit.
+- Enable PCRE.
+- Enable GnuTLS.
+- Enable GSSAPI.
+- Re-enable Nethttpd.
+- Re-add documentation for Netsmtp and Netpop (modules renamed).
+- Enable camlzip.
+
 * Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.1-1
 - New upstream version 4.0.1.
 - ocaml-4.02.1 rebuild.