diff --git a/README b/README
index e9f18f2..aee9be6 100644
--- a/README
+++ b/README
@@ -21,6 +21,7 @@ Current version of script was written and tested against VBoxManage in version
 - discardstate
 - export
 - extpack
+- getextradata
 - list
 - showhdinfo
 - showvminfo
diff --git a/VBoxManage b/VBoxManage
index 9a2b6ce..b307682 100644
--- a/VBoxManage
+++ b/VBoxManage
@@ -7,7 +7,6 @@
 #
 # [1] Sebastian T. Hafner <sonix@own-hero.net>
 #
-# [ ] getextradata
 # [ ] guestcontrol
 # [ ] guestproperty
 # [ ] hostonlyif
@@ -816,6 +815,13 @@ _VBoxManage() {
             fi
             ;;
         getextradata)
+            if [[ ${prev} == ${cmd} ]]; then
+                COMPREPLY=( $(compgen -W "global" -- ${cur}) )
+                _vms_comp vms ${cur}
+            else
+                _get_excluded_items "enumerate"
+                COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
+            fi
             ;;
         guestcontrol)
             ;;