diff --git a/Makefile.am b/Makefile.am
index 4554d5710..dc8a6cae6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,14 @@
 include $(top_srcdir)/gcov.mak
 
-GCOVSOURCES = $(libgirepository_la_SOURCES)
+GCOVSOURCES = $(libgirepository_1_0_la_SOURCES)
 
 girepodir = $(includedir)/gobject-introspection-1.0/
 girepo_HEADERS = girepository.h
 
-lib_LTLIBRARIES = libgirepository.la
+lib_LTLIBRARIES = libgirepository-1.0.la
 noinst_LTLIBRARIES = libgirepository-parser.la
 
-libgirepository_la_SOURCES =			\
+libgirepository_1_0_la_SOURCES =		\
 	girepository.c				\
 	gtypelib.h				\
 	gtypelib.c				\
@@ -20,9 +20,9 @@ libgirepository_la_SOURCES =			\
 	gdump.c					\
 	ginvoke.c
 
-libgirepository_la_CPPFLAGS = $(GIREPO_CFLAGS)
-libgirepository_la_LIBADD = $(GIREPO_LIBS)
-libgirepository_la_LDFLAGS = -no-undefined
+libgirepository_1_0_la_CPPFLAGS = $(GIREPO_CFLAGS)
+libgirepository_1_0_la_LIBADD = $(GIREPO_LIBS)
+libgirepository_1_0_la_LDFLAGS = -no-undefined
 
 libgirepository_parser_la_SOURCES =		\
 	girmodule.c				\
diff --git a/girepository.c b/girepository.c
index 6b34e05b6..f35854a7d 100644
--- a/girepository.c
+++ b/girepository.c
@@ -132,7 +132,7 @@ init_globals (void)
 
       libdir = GOBJECT_INTROSPECTION_LIBDIR;
 
-      typelib_dir = g_build_filename (libdir, "girepository", NULL);
+      typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL);
 
       search_path = g_slist_prepend (search_path, typelib_dir);
 
diff --git a/girparser.c b/girparser.c
index 1072ecc5a..381c334fb 100644
--- a/girparser.c
+++ b/girparser.c
@@ -243,7 +243,7 @@ locate_gir (GIrParser  *parser,
     }
   for (dir = datadirs; *dir; dir++) 
     {
-      path = g_build_filename (*dir, "gir", girname, NULL);
+      path = g_build_filename (*dir, "gir-1.0", girname, NULL);
       if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
 	return path;
       g_free (path);