diff --git a/src/repository.c b/src/repository.c
index 0759c0c26..94f67f497 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -41,6 +41,7 @@
 
 #define GIT_SYMREF "ref: "
 #define GIT_REFS_HEADS "refs/heads/"
+#define GIT_REFS_TAGS "refs/tags/"
 #define GIT_BRANCH_MASTER "master"
 
 static const int default_table_size = 32;
@@ -806,6 +807,16 @@ int git_repository_init__create_structure_or_reinit(git_repository_init_results*
 	if (gitfo_mkdir(temp_path, mode))
 		return GIT_ERROR;
 
+	/* Creates the '/refs/heads/' directory */
+	strcpy(temp_path + path_len, GIT_REFS_HEADS);
+	if (gitfo_mkdir(temp_path, mode))
+		return GIT_ERROR;
+
+	/* Creates the '/refs/tags/' directory */
+	strcpy(temp_path + path_len, GIT_REFS_TAGS);
+	if (gitfo_mkdir(temp_path, mode))
+		return GIT_ERROR;
+
 
 	/* To be implemented */