diff --git a/src/cmd_parser.c b/src/cmd_parser.c
index 073a6576..f77ab10a 100644
--- a/src/cmd_parser.c
+++ b/src/cmd_parser.c
@@ -118,7 +118,7 @@ static GOptionEntry cmd_entries[] =
     { "database", 'd', 0, G_OPTION_ARG_NONE, &(_cmd_options.database),
       "Generate sqlite databases for use with yum.", NULL },
     { "no-database", 0, 0, G_OPTION_ARG_NONE, &(_cmd_options.no_database),
-      "Do not generate sqlite databases in the repository.", NULL },
+      "Do not generate sqlite databases in the repository (default).", NULL },
     { "filelists-ext", 0, 0, G_OPTION_ARG_NONE, &(_cmd_options.filelists_ext),
       "Create filelists-ext metadata with file hashes.", NULL },
     { "update", 0, 0, G_OPTION_ARG_NONE, &(_cmd_options.update),
diff --git a/src/createrepo_c.c b/src/createrepo_c.c
index 616b60f9..b056496a 100644
--- a/src/createrepo_c.c
+++ b/src/createrepo_c.c
@@ -1193,7 +1193,7 @@ main(int argc, char **argv)
     cr_SqliteDb *fex_db = NULL;
     cr_SqliteDb *oth_db = NULL;
 
-    if (!cmd_options->no_database) {
+    if (cmd_options->database) {
         _cleanup_file_close_ int pri_db_fd = -1;
         _cleanup_file_close_ int fil_db_fd = -1;
         _cleanup_file_close_ int fex_db_fd = -1;
@@ -1887,7 +1887,7 @@ main(int argc, char **argv)
     cr_repomdrecordfilltask_free(oth_fill_task, NULL);
 
     // Sqlite db
-    if (!cmd_options->no_database) {
+    if (cmd_options->database) {
 
         gchar *pri_db_name = g_strconcat(tmp_out_repo, "/primary.sqlite",
                                          sqlite_compression_suffix, NULL);
diff --git a/src/mergerepo_c.c b/src/mergerepo_c.c
index e23f07d9..110eaad7 100644
--- a/src/mergerepo_c.c
+++ b/src/mergerepo_c.c
@@ -1242,7 +1242,7 @@ dump_merged_metadata(GHashTable *merged_hashtable,
     cr_SqliteDb *fex_db = NULL;
     cr_SqliteDb *oth_db = NULL;
 
-    if (!cmd_options->no_database) {
+    if (cmd_options->database) {
         gchar *pri_db_filename = NULL;
         gchar *fil_db_filename = NULL;
         gchar *fex_db_filename = NULL;
@@ -1329,7 +1329,7 @@ dump_merged_metadata(GHashTable *merged_hashtable,
                 cr_xmlfile_add_chunk(oth_cr_zck, (const char *) res.other, NULL);
             }
 
-            if (!cmd_options->no_database) {
+            if (cmd_options->database) {
                 cr_db_add_pkg(pri_db, pkg, NULL);
                 cr_db_add_pkg(fil_db, pkg, NULL);
                 if (cmd_options->filelists_ext)
@@ -1585,7 +1585,7 @@ dump_merged_metadata(GHashTable *merged_hashtable,
 
     // Sqlite db
 
-    if (!cmd_options->no_database) {
+    if (cmd_options->database) {
         const char *db_suffix = cr_compression_suffix(cmd_options->db_compression_type);
 
         // Insert XML checksums into the dbs