diff --git a/mythtv/programs/mythfilldatabase/commandlineparser.cpp b/mythtv/programs/mythfilldatabase/commandlineparser.cpp
index a7fad6a9299..4928f359694 100644
--- a/mythtv/programs/mythfilldatabase/commandlineparser.cpp
+++ b/mythtv/programs/mythfilldatabase/commandlineparser.cpp
@@ -15,6 +15,7 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
     addHelp();
     addVersion();
     addLogging();
+    allowPassthrough();
 
     add("--manual", "manual", false, "Run interactive configuration",
             "Manual mode will interactively ask you questions about "
@@ -86,11 +87,11 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
             "restores the behavior of adding every channel in "
             "the downloaded channel lineup to MythTV's lineup, "
             "in case MythTV's smarts fail you.");
-    add("--graboptions", "graboptions", "", "",
-            "Manually define options to pass to the data grabber. "
-            "Do NOT use this option unless you know what you are "
-            "doing. Mythfilldatabase will automatically use the "
-            "correct options for xmltv compliant grabbers.");
+//    add("--graboptions", "graboptions", "", "",
+//            "Manually define options to pass to the data grabber. "
+//            "Do NOT use this option unless you know what you are "
+//            "doing. Mythfilldatabase will automatically use the "
+//            "correct options for xmltv compliant grabbers.");
     add("--cardtype", "cardtype", "", "", "No information.");           // need documentation for this one
     add("--max-days", "maxdays", 0, "force number of days to update",
             "Force the maximum number of days, counting today, "
diff --git a/mythtv/programs/mythfilldatabase/main.cpp b/mythtv/programs/mythfilldatabase/main.cpp
index bc115a438c1..99cfccaa3c9 100644
--- a/mythtv/programs/mythfilldatabase/main.cpp
+++ b/mythtv/programs/mythfilldatabase/main.cpp
@@ -212,8 +212,8 @@ int main(int argc, char *argv[])
         fill_data.chan_data.remove_new_channels = true;
     if (cmdline.toBool("nofilterchannels"))
         fill_data.chan_data.filter_new_channels = false;
-    if (cmdline.toBool("graboptions"))
-        fill_data.graboptions = " " + cmdline.toString("graboptions");
+    if (!cmdline.GetPassthrough().isEmpty())
+        fill_data.graboptions = " " + cmdline.GetPassthrough();
     if (cmdline.toBool("sourceid"))
         sourceid = cmdline.toInt("sourceid");
     if (cmdline.toBool("cardtype"))