diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c
index 495b27e5..7db9edc5 100644
--- a/src/ostree/ot-builtin-remote.c
+++ b/src/ostree/ot-builtin-remote.c
@@ -27,9 +27,11 @@
 #include "otutil.h"
 
 char **opt_set;
+gboolean opt_no_gpg_verify;
 
 static GOptionEntry options[] = {
   { "set", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_set, "Set config option KEY=VALUE for remote", "KEY=VALUE" },
+  { "no-gpg-verify", 0, 0, G_OPTION_ARG_NONE, &opt_no_gpg_verify, "Disable GPG verification", NULL },
   { NULL }
 };
 
@@ -124,6 +126,10 @@ ostree_builtin_remote (int argc, char **argv, OstreeRepo *repo, GCancellable *ca
         g_key_file_set_string_list (config, key, "branches",
                                     (const char *const *)branches->pdata,
                                     branches->len);
+
+      if (opt_no_gpg_verify)
+        g_key_file_set_boolean (config, key, "gpg-verify", FALSE);
+
       g_free (key);
     }
   else if (!strcmp (op, "show-url"))
diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh
index 252090b3..7cd88124 100755
--- a/tests/test-remote-add.sh
+++ b/tests/test-remote-add.sh
@@ -21,10 +21,14 @@ set -e
 
 . $(dirname $0)/libtest.sh
 
-echo '1..2'
+echo '1..3'
 
 setup_test_repository "bare"
 $OSTREE remote add origin http://example.com/ostree/gnome
 echo "ok remote add"
 assert_file_has_content $test_tmpdir/repo/config "example.com"
 echo "ok config"
+
+$OSTREE remote add --no-gpg-verify another http://another.com/repo
+assert_file_has_content $test_tmpdir/repo/config "gpg-verify=false"
+echo "ok remote no gpg-verify"