diff --git a/libdevice/devices_unix.go b/libdevice/devices_unix.go
index e98bb97..36a6ada 100644
--- a/libdevice/devices_unix.go
+++ b/libdevice/devices_unix.go
@@ -18,16 +18,15 @@ package libdevice
 import (
 	"errors"
 	"fmt"
+	"github.com/mrunalp/fileutils"
+	"github.com/sirupsen/logrus"
+	"golang.org/x/sys/unix"
+	"isula.org/syscontainer-tools/types"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"syscall"
-
-	"github.com/mrunalp/fileutils"
-	"github.com/sirupsen/logrus"
-	"golang.org/x/sys/unix"
-	"isula.org/syscontainer-tools/types"
 )
 
 var (
@@ -287,6 +286,7 @@ func AddDeviceToSysBlock(node *types.Device) error {
 	if err != nil {
 		return err
 	}
+	hostDeviceName := filepath.Base(realPath)
 	containerDeviceName := filepath.Base(node.Path)
 	if err := os.Chdir(filepath.Join(node.Root, MountSourcePath)); err != nil {
 		return err
@@ -303,6 +303,14 @@ func AddDeviceToSysBlock(node *types.Device) error {
 	if err := os.Symlink(destPath, containerDeviceName); err != nil {
 		return err
 	}
+	if err := os.Chdir(filepath.Join(node.Root, "/dev")); err != nil {
+		return err
+	}
+	if hostDeviceName != containerDeviceName {
+		if _, err := os.Stat(hostDeviceName); os.IsNotExist(err) {
+			return os.Symlink(containerDeviceName, hostDeviceName)
+		}
+	}
 	return nil
 }
 
@@ -310,11 +318,20 @@ func AddDeviceToSysBlock(node *types.Device) error {
 func RemoveDeviceFromSysBlock(path string) error {
 	containerDeviceName := filepath.Base(path)
 	linkPath := filepath.Join(MountDestPath, containerDeviceName)
+	realPath, err := os.Readlink(linkPath)
+	if err != nil {
+		return err
+	}
+	hostDeviceName := filepath.Base(realPath)
+	devPath := filepath.Join("/dev", hostDeviceName)
 	if _, err := os.Lstat(linkPath); err == nil {
 		if err := os.Remove(linkPath); err != nil {
 			return err
 		}
 	}
+	if hostDeviceName != containerDeviceName {
+		return os.Remove(devPath)
+	}
 	return nil
 }