diff --git a/CHANGELOG.md b/CHANGELOG.md
index 312fd00..b4efa5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Some installation's instructions only run if running a PVE kernel (test the new is_pve_kernel fact).
 
 ##### Bugfixes
+* #14 The module no longer automatically reboot nodes after kernel upgrade, show a warning message instead.
 
 
 ---------------------------------------
diff --git a/manifests/hypervisor/install.pp b/manifests/hypervisor/install.pp
index 9cf6c6e..091503b 100644
--- a/manifests/hypervisor/install.pp
+++ b/manifests/hypervisor/install.pp
@@ -1,6 +1,6 @@
 # == Class: proxmox::hypervisor::install
 #
-# Install Proxmox and reboot the system on the PVE kernel
+# Install Proxmox and inform the user he needs to reboot the system on the PVE kernel
 #
 class proxmox::hypervisor::install {
 
@@ -47,7 +47,7 @@ class proxmox::hypervisor::install {
       ->
       package { $proxmox::hypervisor::kernel_kvm_pkg_name:
         ensure => $proxmox::hypervisor::ve_pkg_ensure,
-        notify => Exec['update_grub','reboot_to_pve'],
+        notify => Exec['update_grub'],
       }
     }
     else {
@@ -63,7 +63,6 @@ class proxmox::hypervisor::install {
 
   }
 
-
   # Ensure the grub is update
   exec { 'update_grub':
     command     => 'update-grub',
@@ -74,13 +73,6 @@ class proxmox::hypervisor::install {
   exec { 'grub_reboot':
     command     => 'grub-reboot 2',
     refreshonly => true,
-    notify      => Exec['reboot_to_pve'],
-  }
-
-  # Reboot on a PVE Kernel
-  exec { 'reboot_to_pve':
-    command     => 'shutdown -r 1',
-    refreshonly => true,
   }