diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index c1e841dfe..fed6feec2 100644
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -3,7 +3,8 @@ include $(top_srcdir)/config/Rules.am
 DEFAULT_INCLUDES += \
 	-I$(top_srcdir)/lib
 
-sbin_PROGRAMS = spl splat
+noinst_PROGRAMS = spl
+sbin_PROGRAMS = splat
 
 spl_SOURCES = spl.c
 
diff --git a/module/spl/spl-debug.c b/module/spl/spl-debug.c
index 0dd59db56..3c3dab0c8 100644
--- a/module/spl/spl-debug.c
+++ b/module/spl/spl-debug.c
@@ -1099,10 +1099,11 @@ void spl_debug_bug(char *file, const char *func, const int line, int flags)
                 spl_panic_in_progress = 1;
 
         spl_debug_dumpstack(NULL);
-        spl_debug_dumplog(flags);
 
-        if (spl_debug_panic_on_bug)
+        if (spl_debug_panic_on_bug) {
+                spl_debug_dumplog(flags);
                 panic("SPL PANIC");
+        }
 
         set_task_state(current, TASK_UNINTERRUPTIBLE);
         while (1)