diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 2696c548964be36cc07a4efd7d9520a6f1c20ce3..0b5ae350683180de797d1f86f8e6c3ba68507669 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -999,6 +999,12 @@ int main(int argc, char **argv) {
         }
     }
 
+    if (optind != argc) {
+        fprintf(stderr, "%s: unexpected, non-option, command line arguments\n",
+                argv[0]);
+        exit(EXIT_FAILURE);
+    }
+
     if (!(config = daemonConfigNew(privileged))) {
         VIR_ERROR(_("Can't create initial configuration"));
         exit(EXIT_FAILURE);