diff --git a/main.c b/main.c
index 17d98f0..61b2551 100644
--- a/main.c
+++ b/main.c
@@ -749,8 +749,18 @@ main(int argc, char *argv[])
 
 	if ((want_flags & PKG_VERSION) == PKG_VERSION)
 	{
-		version();
-		return EXIT_SUCCESS;
+		if (argc > 2)
+		{
+			fprintf(stderr, "%s: --version specified with other options or module names, assuming --modversion.\n", argv[0]);
+
+			want_flags &= ~PKG_VERSION;
+			want_flags |= PKG_MODVERSION;
+		}
+		else
+		{
+			version();
+			return EXIT_SUCCESS;
+		}
 	}
 
 	if ((want_flags & PKG_HELP) == PKG_HELP)