diff --git a/completion/available/capistrano.completion.bash b/completion/available/capistrano.completion.bash
old mode 100755
new mode 100644
diff --git a/completion/available/terraform.completion.bash b/completion/available/terraform.completion.bash
index 11985f1d..9fe0795a 100644
--- a/completion/available/terraform.completion.bash
+++ b/completion/available/terraform.completion.bash
@@ -1,35 +1,65 @@
 #!/usr/bin/env bash
-# Bash Terraform completion
-# Source: https://gist.github.com/cornfeedhobo/8bc08747ec3add1fc5adb2edb7cd68d3
+#
+# Bash completion for the terraform command
+#
+# Copyright (C) 2018 Vangelis Tasoulas
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-_terraform() {
-  local cur prev words cword opts
-  _get_comp_words_by_ref -n : cur prev words cword
-  COMPREPLY=()
-  opts=""
+_terraform()
+{
+	local cur prev words cword opts
+	_get_comp_words_by_ref -n : cur prev words cword
+	COMPREPLY=()
+	opts=""
 
-  if [[ ${cur} == -* ]] ; then
-    compopt -o nospace
-  fi
+	if [[ ${cword} -eq 1 ]] ; then
 
-  if [[ ${cword} -eq 1 ]] ; then
-    if [[ ${cur} == -* ]] ; then
-      opts="--help --version"
-    else
-      opts="$(terraform --help | grep -vE '(usage|Available|^$)' | awk '{print $1}')"
-    fi
-  fi
+		# Options that do not start with a hyphen, are always starting with four spaces.
+		opts="$(terraform --help | grep -P '^\s\s\s\s\S' | awk '{print $1}')"
+		opts="${opts} --help --version"
 
-  if [[ ${cword} -gt 1 ]] ; then
-    if [[ ${cword} -eq 2 && ${prev} == '--help' ]] ; then
-      opts="$(terraform --help | grep -vE '(usage|Available|^$)' | awk '{print $1}')"
-    else
-      opts="$(terraform --help "${words[1]}" | grep '^ *-[a-z]' | awk '{print $1}' | awk -F '=' '{if ($0 ~ /=/) {print $1"="} else {print $1" "}}')"
-    fi
-  fi
+	elif [[ ${cword} -gt 1 ]] ; then
 
-  COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-  return 0
+		if [[ ${cword} -eq 2 && ${prev} == '--help' ]] ; then
+
+			opts="$(terraform --help | grep -P '^\s\s\s\s\S' | awk '{print $1}')"
+
+		elif [[ ${words[1]} != "--help" && ${words[1]} != "--version" && ${words[1]} != "version" ]] ; then
+
+			# Some commands accept hyphened parameters, ...
+			opts="$(terraform --help "${words[1]}" | grep -P '^\s+-' | awk '{print $1}' | awk -F '=' '{ if ($0 ~ /=/) {print $1"="} else {print $1} }')"
+			# but some other commands accept non-hyphened parameters.
+			opts="${opts} $(terraform --help "${words[1]}" | grep -P '^\s\s\s\s\S' | awk '{print $1}')"
+			# All of the commands accept the --help parameter which is not listed
+			# by the 'terraform --help <command>
+			opts="${opts} --help"
+
+		fi
+	fi
+
+	COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+
+	if [[ ${#COMPREPLY[*]} -eq 1 ]] ; then
+		if [[ ${COMPREPLY[0]} == *= ]] ; then
+			# When only one completion is left, check if there is an equal sign.
+			# If an equal sign, then add no space after the autocompleted word.
+			compopt -o nospace
+		fi
+	fi
+	return 0
 }
 
 complete -F _terraform terraform