diff --git a/completion/bash b/completion/bash
index ee2abbbb..67506c6a 100644
--- a/completion/bash
+++ b/completion/bash
@@ -5,6 +5,19 @@ _terminator()
     local cur prev words cword
     _init_completion || return
 
+    case $prev in
+        --profile | -p)
+            COMPREPLY=($(compgen -W "$($1 --list-profiles)"\
+            -- "$cur"))
+            return
+            ;;
+        --layout | -l)
+            COMPREPLY=($(compgen -W "$($1 --list-layouts)"\
+            -- "$cur"))
+            return
+            ;;
+    esac
+
     COMPREPLY=($(compgen -W "$($1 --help | tr ',' '\n' |
         command sed -n -e 's/^ *\(--\?[a-zA-Z\-]\+=\?\).*/\1/p')"\
     -- "$cur"))
diff --git a/terminatorlib/optionparse.py b/terminatorlib/optionparse.py
index 60308ca0..f4b1011f 100644
--- a/terminatorlib/optionparse.py
+++ b/terminatorlib/optionparse.py
@@ -114,10 +114,12 @@ icon for the window (by file or name)'))
         sys.exit(0)
 
     if options.list_profiles:
-        print(Terminator().config.list_profiles())
+        for p in Terminator().config.list_profiles():
+            print(p)
         sys.exit(0)
     if options.list_layouts:
-        print(Terminator().config.list_layouts())
+        for l in Terminator().config.list_layouts():
+            print(l)
         sys.exit(0)
 
     if options.debug_classes or options.debug_methods: