diff --git a/README.rst b/README.rst
index 5bbfd83..d764a13 100644
--- a/README.rst
+++ b/README.rst
@@ -270,6 +270,31 @@ Manages php-fpm pool config files.
 
 Manages the php-fpm service.
 
+``php.ng.hhvm``
+---------------
+
+Meta-state that combines php.ng.hhvm states
+
+``php.ng.hhvm.config``
+----------------------
+
+Manages the php-hhvm config files
+
+``php.ng.hhvm.install``
+-----------------------
+
+Installs the php-hhvm package
+
+``php.ng.hhvm.repo``
+--------------------
+
+Configures the hhvm repo for debian/ubuntu
+
+``php.ng.hhvm.service``
+-----------------------
+
+Manages the php-hhvm service.
+
 ``php.ng.gd``
 -------------
 
diff --git a/php/ng/hhvm/config.sls b/php/ng/hhvm/config.sls
index 095bb5c..f257a6f 100644
--- a/php/ng/hhvm/config.sls
+++ b/php/ng/hhvm/config.sls
@@ -2,15 +2,15 @@
 {% from "php/ng/map.jinja" import php with context %}
 {% from "php/ng/ini.jinja" import php_ini %}
 
-{% set ini_settings = php.ini.defaults %}
-{% do ini_settings.update(php.hhvm.config.ini.settings) %}
+{% set server_settings = php.lookup.hhvm.server %}
+{% do server_settings.update(php.hhvm.config.server.settings) %}
 
-{% set conf_settings = php.lookup.hhvm.defaults %}
-{% do conf_settings.update(php.hhvm.config.conf.settings) %}
+{% set php_settings = php.lookup.hhvm.php %}
+{% do php_settings.update(php.hhvm.config.php.settings) %}
 
 php_hhvm_ini_config:
-  {{ php_ini(php.lookup.hhvm.ini, php.hhvm.config.ini.opts, ini_settings) }}
+  {{ php_ini(php.lookup.hhvm.conf, php.hhvm.config.server.opts, server_settings) }}
 
 php_hhvm_conf_config:
-  {{ php_ini(php.lookup.hhvm.conf, php.hhvm.config.conf.opts, conf_settings) }}
+  {{ php_ini(php.lookup.hhvm.ini, php.hhvm.config.php.opts, php_settings) }}
 
diff --git a/php/ng/hhvm/init.sls b/php/ng/hhvm/init.sls
index deea0f9..080edb6 100644
--- a/php/ng/hhvm/init.sls
+++ b/php/ng/hhvm/init.sls
@@ -9,7 +9,7 @@ extend:
   php_hhvm_service:
     service:
       - watch:
-        - file: php_hhvm_ini_cnfig
+        - file: php_hhvm_ini_config
         - file: php_hhvm_conf_config
       - require:
         - sls: php.ng.hhvm.config
diff --git a/php/ng/map.jinja b/php/ng/map.jinja
index 6e30cca..0ae6188 100644
--- a/php/ng/map.jinja
+++ b/php/ng/map.jinja
@@ -55,12 +55,25 @@
                 'conf': '/etc/hhvm/server.ini',
                 'ini': '/etc/hhvm/php.ini',
                 'service': 'hhvm',
-                'defaults': odict([
-                    ('global', odict([
-                        ('pid', '/var/run/hhvm.pid'),
-                        ('error_log', '/var/log/hhvm.log'),
-                    ])),
-                ]),
+                'defaults': {},
+                'server': odict([
+                    ('pid', '/var/run/hhvm.pid'),
+                    ('hhvm.server.port', '9000'),
+                    ('hhvm.server.type', 'fastcgi'),
+                    ('hhvm.server.default_document', 'index.php'),
+                    ('hhvm.log.use_log_file', 'true'),
+                    ('hhvm.log.file', '/var/log/hhvm/error.log'),
+                    ('hhvm.repo.central.path', '/var/run/hhvm/hhvm.hhbc'),
+                    ]),
+                'php': odict([
+                     ('session.save_handler', 'files'),
+                     ('session.save_path', '/var/lib/hhvm/sessions'),
+                     ('session.gc_maxlifetime', '1440'),
+                     ('hhvm.log.level', 'Warning'),
+                     ('hhvm.log.always_log_unhandled_exceptions', 'true'),
+                     ('hhvm.log.runtime_error_reporting_level', '8191'),
+                     ('hhvm.mysql.typed_results', 'false'),
+                    ]),
             },
             'cli': {
                 'ini': '/etc/php5/cli/php.ini',
@@ -216,11 +229,11 @@
             'opts': {},
          },
          'config': {
-            'ini': {
+            'server': {
                 'opts': {},
                 'settings': {},
             },
-            'conf': {
+            'php': {
                 'opts': {},
                 'settings': {},
             },