diff --git a/ChangeLog b/ChangeLog
index 69a8f8371..49c49794c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,7 @@
 2.0.1 ()
 
 Features
- + Feature #325, #339, #435, User Defined Attributes.
+ + Feature #164, #325, #339, #435, #553, #554, #975, User Defined Attributes.
  + Feature #457, #922, tasks may now be given an 'until' date, after which they
    expire and are deleted.
  + Feature #516, which allows the duplication of completed tasks (thanks to
diff --git a/NEWS b/NEWS
index 2173b7717..93dec3196 100644
--- a/NEWS
+++ b/NEWS
@@ -14,7 +14,7 @@ New Features in taskwarrior 2.0.1
 New commands in taskwarrior 2.0.1
 
   - New 'ready' report that lists tasks ready for work, sorted by urgency.
-  - New 'udas' command shows UDA details.
+  - New 'udas' command shows UDA details and warnings.
   - New '_udas' helper command lists UDA names for completion purposes.
 
 New configuration options in taskwarrior 2.0.1
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 35c01a7d5..d26bb6946 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -81,13 +81,15 @@ int CmdUDAs::execute (std::string& output)
     view.add (Column::factory ("string", STRING_COLUMN_LABEL_UDA));
     view.add (Column::factory ("string", STRING_COLUMN_LABEL_TYPE));
     view.add (Column::factory ("string", STRING_COLUMN_LABEL_LABEL));
+    view.add (Column::factory ("string", STRING_COLUMN_LABEL_VALUES));
 
 
     std::vector <std::string>::iterator uda;
     for (uda = udas.begin (); uda != udas.end (); ++uda)
     {
-      std::string type  = context.config.get ("uda." + *uda + ".type");
-      std::string label = context.config.get ("uda." + *uda + ".label");
+      std::string type   = context.config.get ("uda." + *uda + ".type");
+      std::string label  = context.config.get ("uda." + *uda + ".label");
+      std::string values = context.config.get ("uda." + *uda + ".values");
       if (label == "")
         label = *uda;
 
@@ -95,6 +97,7 @@ int CmdUDAs::execute (std::string& output)
       view.set (row, 0, *uda);
       view.set (row, 1, type);
       view.set (row, 2, label);
+      view.set (row, 3, values);
     }
 
     out << optionalBlankLine ()
diff --git a/src/en-US.h b/src/en-US.h
index 104168c31..71aada672 100644
--- a/src/en-US.h
+++ b/src/en-US.h
@@ -186,6 +186,7 @@
 #define STRING_COLUMN_LABEL_UDA      "Name"
 #define STRING_COLUMN_LABEL_TYPE     "Type"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
+#define STRING_COLUMN_LABEL_VALUES   "Allowed Values"
 
 // Column Examples
 #define STRING_COLUMN_EXAMPLES_TAGS  "home @chore"