diff --git a/_modules/virtng.py b/_modules/virtng.py
index e664f68..f9f93b9 100644
--- a/_modules/virtng.py
+++ b/_modules/virtng.py
@@ -550,7 +550,7 @@
          start=True,  # pylint: disable=redefined-outer-name
          disk='default',
          saltenv='base',
-         rng={},
+         rng=None,
          **kwargs):
     '''
     Initialize a new vm
@@ -563,6 +563,7 @@
         salt 'hypervisor' virt.init vm_name 4 512 nic=profile disk=profile
     '''
 
+    rng = rng or {'backend':'/dev/urandom'}
     hypervisor = __salt__['config.get']('libvirt:hypervisor', hypervisor)
 
     nicp = _nic_profile(nic, hypervisor, **kwargs)
diff --git a/salt/files/minion.conf b/salt/files/minion.conf
index 12509e1..1743fda 100644
--- a/salt/files/minion.conf
+++ b/salt/files/minion.conf
@@ -69,7 +69,7 @@
 log_level: {{ minion.log.get('level', 'error') }}
 state_output: {{ minion.log.get('state_output', 'changes') }}
 
-{%- if minion.proxy is defined %}
+{%- if minion.get('proxy', {}).get('host', "") != "" %}
 proxy_host: {{ minion.proxy.host }}
 proxy_port: {{ minion.proxy.port }}
 {%- endif %}
diff --git a/salt/minion/base.sls b/salt/minion/base.sls
new file mode 100644
index 0000000..62a1748
--- /dev/null
+++ b/salt/minion/base.sls
@@ -0,0 +1,88 @@
+{#- This state can be called explicitly. Do not include this file in minion.init #}
+{%- from "salt/map.jinja" import minion,renderer with context %}
+{%- if minion.enabled %}
+
+{%- if minion.source.get('engine', 'pkg') == 'pkg' %}
+
+salt_minion_packages:
+  pkg.installed:
+  - names: {{ minion.pkgs }}
+  {%- if minion.source.version is defined %}
+  - version: {{ minion.source.version }}
+  {%- endif %}
+
+salt_minion_dependency_packages:
+  pkg.installed:
+  - pkgs: {{ minion.dependency_pkgs }}
+
+{%- elif minion.source.get('engine', 'pkg') == 'pip' %}
+
+salt_minion_packages:
+  pip.installed:
+  - name: salt{% if minion.source.version is defined %}=={{ minion.source.version }}{% endif %}
+
+salt_minion_dependency_packages:
+  pkg.installed:
+  - pkgs: {{ minion.dependency_pkgs_pip }}
+
+{%- endif %}
+
+/etc/salt/minion.d/minion.conf:
+  file.managed:
+  - source: salt://salt/files/minion.conf
+  - user: root
+  - group: root
+  - template: jinja
+  - require:
+    - {{ minion.install_state }}
+
+{%- if renderer | length > 0 %}
+
+/etc/salt/minion.d/_renderer.conf:
+  file.managed:
+  - source: salt://salt/files/_renderer.conf
+  - user: root
+  - template: jinja
+  - require:
+    - {{ minion.install_state }}
+  - watch_in:
+    - service: salt_minion_service
+
+{%- endif %}
+
+salt_minion_service:
+  service.running:
+    - name: {{ minion.service }}
+    - enable: true
+    - require:
+      - pkg: salt_minion_packages
+      - pkg: salt_minion_dependency_packages
+    {%- if grains.get('noservices') %}
+    - onlyif: /bin/false
+    {%- endif %}
+
+{#- Restart salt-minion if needed but after all states are executed #}
+salt_minion_service_restart:
+  cmd.run:
+    - name: 'while true; do salt-call saltutil.running|grep fun: && continue; salt-call --local service.restart {{ minion.service }}; break; done'
+    - shell: /bin/bash
+    - bg: true
+    - order: last
+    - onchanges:
+      - file: /etc/salt/minion.d/minion.conf
+    {%- if grains.get('noservices') %}
+    - onlyif: /bin/false
+    {%- endif %}
+    - require:
+      - service: salt_minion_service
+
+salt_minion_sync_all:
+  module.run:
+    - name: 'saltutil.sync_all'
+    - onchanges:
+      - service: salt_minion_service
+    - require:
+      - pkg: salt_minion_packages
+      - pkg: salt_minion_dependency_packages
+
+{%- endif %}