diff --git a/install/updates/Makefile.am b/install/updates/Makefile.am
index 002a83b5d..e11b6bc71 100644
--- a/install/updates/Makefile.am
+++ b/install/updates/Makefile.am
@@ -4,12 +4,12 @@ appdir = $(IPA_DATA_DIR)/updates
 app_DATA =				\
 	automount.update		\
 	groupofhosts.update		\
-	host.update			\
 	indices.update			\
 	nss_ldap.update			\
 	replication.update		\
 	RFC2307bis.update		\
 	RFC4876.update			\
+	netgroups.update		\
 	winsync_index.update		\
 	$(NULL)
 
diff --git a/install/updates/automount.update b/install/updates/automount.update
index 13d9a6df0..c89d583ae 100644
--- a/install/updates/automount.update
+++ b/install/updates/automount.update
@@ -1,39 +1,3 @@
-#
-# An automount schema based on RFC 2307-bis.
-#
-# This schema defines new automount and automountMap objectclasses to represent
-# the automount maps and their entries.
-#
-dn: cn=schema
-add:attributeTypes:
-  ( 1.3.6.1.1.1.1.31 NAME 'automountMapName'
-    DESC 'automount Map Name'
-    EQUALITY caseExactIA5Match
-    SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE
-    X-ORIGIN 'RFC 2307bis' )
-add:attributeTypes:
-  ( 1.3.6.1.1.1.1.32 NAME 'automountKey'
-    DESC 'Automount Key value'
-    EQUALITY caseExactIA5Match
-    SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE
-    X-ORIGIN 'RFC 2307bis' )
-add:attributeTypes:
-  ( 1.3.6.1.1.1.1.33 NAME 'automountInformation'
-    DESC 'Automount information'
-    EQUALITY caseExactIA5Match
-    SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE
-    X-ORIGIN 'RFC 2307bis' )
-add:objectClasses:
-  ( 1.3.6.1.1.1.2.16 NAME 'automountMap'
-    DESC 'Automount Map information' SUP top
-    STRUCTURAL MUST automountMapName MAY description
-    X-ORIGIN 'RFC 2307bis' )
-add:objectClasses:
-  ( 1.3.6.1.1.1.2.17 NAME 'automount'
-    DESC 'Automount information' SUP top STRUCTURAL
-    MUST ( automountKey $ automountInformation ) MAY description
-    X-ORIGIN 'RFC 2307bis' )
-
 # Add the default automount entries
 
 dn: cn=automount,$SUFFIX
diff --git a/install/updates/host.update b/install/updates/host.update
deleted file mode 100644
index f5ecda5ac..000000000
--- a/install/updates/host.update
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Schema for IPA Hosts
-#
-dn: cn=schema
-add: attributeTypes:
-  ( 2.16.840.1.113730.3.8.3.10  NAME 'ipaClientVersion' 
-    DESC 'Text string describing client version of the IPA software installed' 
-    SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 
-    X-ORIGIN 'IPA v2' )
-  
-add: attributeTypes:
-  ( 2.16.840.1.113730.3.8.3.11  NAME 'enrolledBy' 
-    DESC 'DN of administrator who performed manual enrollment of the host' 
-    SYNTAX 1.3.6.1.4.1.1466.115.121.1.12  
-    X-ORIGIN 'IPA v2' )
-add: objectClasses:
-  ( 2.16.840.1.113730.3.8.4.2 NAME 'ipaHost' 
-    AUXILIARY 
-    MAY ( userPassword $ ipaClientVersion $ enrolledBy) 
-    X-ORIGIN 'IPA v2' )
-add: objectClasses:
-  ( 2.5.6.21 NAME 'pkiUser'
-   SUP top AUXILIARY
-   MAY ( userCertificate )
-   X-ORIGIN 'RFC 2587' )