diff --git a/system/base/base-files/base-files.sysconf b/system/base/base-files/base-files.sysconf
index 8c268b94..4ee894ce 100644
--- a/system/base/base-files/base-files.sysconf
+++ b/system/base/base-files/base-files.sysconf
@@ -1,6 +1,6 @@
 #!/bin/sh
-if [ ! -d /data/user/root ]; then
-    cat /etc/passwd.d/* > /etc/passwd
+mkdir -p /var/lib/ymp/sysconf/base-files/
+if [ ! -f /var/lib/ymp/sysconf/base-files/postinstall.done ]; then
     mkdir /data/user/root -p
     mkdir /data/log -p
     mkdir -p /kernel/modules
@@ -16,6 +16,11 @@ if [ ! -d /data/user/root ]; then
     ln -s ../kernel/modules /lib/modules
     ln -s ../kernel/firmware /lib/firmare
     ln -s ../lib64 /usr/lib
-else
-    exit 0
+    date > /var/lib/ymp/sysconf/base-files/postinstall.done
+    touch /etc/passwd
 fi
+cat /etc/passwd.d/* | while read line ; do
+    if ! grep "^${line}$" /etc/passwd > /dev/null ; then
+        echo "${line}" >> /etc/passwd
+    fi
+done
diff --git a/system/base/base-files/ympbuild b/system/base/base-files/ympbuild
index ea99ea29..d4e3a870 100644
--- a/system/base/base-files/ympbuild
+++ b/system/base/base-files/ympbuild
@@ -7,14 +7,14 @@ description='Base system files'
 email='parduscix@yandex.ru'
 maintainer='sulincix'
 license=('GPLv3')
-source=("https://gitlab.com/sulix/devel/sources/base-files/-/archive/$version/base-files-$version.zip")
-md5sums=('3f58695b0babbca2691a8bbcadd2d131')
+source=("https://gitlab.com/sulix/devel/sources/base-files/-/archive/$version/base-files-$version.zip"
+        "base-files.sysconf")
+md5sums=('cd0c378da701d2eb8f6ee5e2b59d55e4'
+         'SKIP')
 arch=(x86_64)
 group=(system.base)
 
-if [[ -d "$name-$version" ]] ; then
-    cd "$name-$version"
-fi
+cd "$name-$version"
 
 package(){
     mkdir -p ${DESTDIR}/etc/sysconf.d