diff --git a/README.md b/README.md
index 2df85806..8887245d 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,6 @@
 *Read the NEW_FEATURES file for recent extensions to Smarty 3.1 functionality*
 
 Smarty packages are now on github and can be installed with Composer.
- 
-**NOTE: Because of this change you must clear your local composer cache with the "composer clearcache" command**
 
 The "smarty/smarty" package will start at libs/....   subfolder.
 
@@ -31,3 +29,6 @@ For a specific version use something like
     }
 
 Composer can also be used for Smarty2 versions 2.6.24 to 2.6.28
+
+Starting with version 3.1.22 a "require-dev" section has been added in commposer.json
+to load the PHPUnit test and the lexer/parser generator,
diff --git a/composer.json b/composer.json
index f744cbc7..e667227d 100644
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,16 @@
     ],
     "support": {
         "irc": "irc://irc.freenode.org/smarty",
-        "issues": "http://code.google.com/p/smarty-php/issues/list",
+        "issues": "https://github.com/smarty-php/smarty/issues",
         "forum": "http://www.smarty.net/forums/"
     },
     "require": {
         "php": ">=5.2"
     },
+    "require-dev": {
+        "smarty/smarty-phpunit": "~3.1@dev",
+        "smarty/smarty-lexer": "~3.1@dev"
+    },
     "autoload": {
         "classmap": [
             "libs/Smarty.class.php",