diff --git a/autogen.sh b/autogen.sh
index 74543732da..213fb08329 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ REQUIRED_AUTOMAKE_VERSION=1.9
 PKG_NAME=NetworkManager
 
 (test -f $srcdir/configure.ac \
-  && test -f $srcdir/src/NetworkManager.c) || {
+  && test -f $srcdir/src/main.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h
index 648f4cd0dd..df78f1885a 100644
--- a/src/dhcp-manager/nm-dhcp-manager.h
+++ b/src/dhcp-manager/nm-dhcp-manager.h
@@ -80,7 +80,7 @@ NMIP4Config *nm_dhcp_manager_test_ip4_options_to_config (const char *dhcp_client
                                                          GHashTable *options,
                                                          const char *reason);
 
-/* Only for NetworkManager.c */
+/* Only for main.c */
 NMDHCPManager *nm_dhcp_manager_new (const char *client, GError **error);
 
 #endif /* NM_DHCP_MANAGER_H */