diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b61809333..aa4194e97 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,6 +7,7 @@ include_directories (${CMAKE_SOURCE_DIR}
 
 set (task_SRCS A3.cpp A3.h
                A3t.cpp A3t.h
+               Alias.cpp Alias.h
                Arg.cpp Arg.h
                Color.cpp Color.h
                Config.cpp Config.h
diff --git a/src/Context.cpp b/src/Context.cpp
index 72f536d56..b6014ec81 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -153,6 +153,8 @@ int Context::initialize (int argc, const char** argv)
     loadAliases ();
     a3.resolve_aliases ();
     a3t.findAliases ();
+    aliases2.load ();
+    aliases2.resolve (a3t.tree ());
 
     // Initialize the color rules, if necessary.
     if (color ())
@@ -219,8 +221,8 @@ int Context::initialize (int argc, const char** argv)
 
     // TODO Uncommenting this breaks unit tests because of the errors it
     //      generates.
-    Tree* parseTree = NULL;
-    //Tree* parseTree = a3t.parse ();
+    //Tree* parseTree = NULL;
+    Tree* parseTree = a3t.parse ();
 
     // Initialize the command line parser.
     if (parseTree && config.getBoolean ("debug"))
diff --git a/src/Context.h b/src/Context.h
index b6a52c339..905b7f187 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -34,6 +34,7 @@
 #include <TDB2.h>
 #include <Hooks.h>
 #include <DOM.h>
+#include <Alias.h>
 #include <Path.h>
 #include <File.h>
 #include <Directory.h>
@@ -92,6 +93,7 @@ public:
 
   TDB2                                tdb2;
   std::map <std::string, std::string> aliases;
+  Alias                               aliases2;
   Hooks                               hooks;
   DOM                                 dom;