diff --git a/scripts/aspell-pws b/scripts/aspell-pws
index 6051efe3f..584cdc552 100644
--- a/scripts/aspell-pws
+++ b/scripts/aspell-pws
@@ -1,74 +1,90 @@
 personal_ws-1.1 en 500
-usr
-lib
-sbin
-env
-bash
-etc
-var
-dudect
-dut
-runtime
-todo
-fixme
-hotfix
-qtest
-vscode
-sanitizer
-unix
-linux
-valgrind
-ubuntu
-gdb
-sdk
+aarch
+abbrev
+abcdefghijklmnopqrstuvwxyz
+acct
+AddressSanitizer
+adjtime
+adjtimex
+alignas
+alignof
+alloc
+apt
+arch
+arg
+args
+Arm
+asan
 aspell
-cppcheck
-glibc
-git
-pre
-gcc
-clang
-enqueue
-dequeue
-fifo
-lifo
-stdin
-stdout
-stderr
-strdup
-strcmp
-strcasecmp
-snprintf
-sprintf
-strcat
-strchr
-strcmp
-strcoll
-strcpy
-strcspn
-strerror
-strlen
-strncasecmp
-strncat
-strncmp
-strncpy
-strpbrk
-strrchr
-strspn
-strstr
-strtod
-strtof
-strtok
-strtol
-strtold
-strtoul
 atexit
 atof
 atoi
 atol
+awk
+backtick
+bash
+BitInt
+brk
 bsearch
 calloc
+capget
+capset
+changeid
+char
+chdir
+checksum
+chmod
+chown
+chroot
+CI
+cjk
+clang
+cmd
+cmu
+cntvct
+col
+commitlog
+compat
+constexpr
+cpp
+cppcheck
+cpu
+creat
+crit
+csapp
+ctrl
+dA
+dbg
+dC
+dD
+dequeue
+dereference
+dereferenced
+dev
+dict
+dpkg
+dudect
+dup
+dut
+EditorConfig
+el
+ele
+en
+enqueue
+enum
+env
+epoll
+errno
+etc
+eventfd
+fadvise
+fchdir
+fchmod
+fchown
 fclose
+fcntl
+fd
+fdatasync
 fdopen
 feof
 ferror
@@ -76,8 +92,14 @@ fflush
 fgetc
 fgetpos
 fgets
+fifo
 fileno
+fixme
+flock
+fmt
+fmtscan
 fopen
+foreach
 fprintf
 fputc
 fputs
@@ -86,12 +108,50 @@ freopen
 fscanf
 fseek
 fsetpos
+fstatfs
+fsync
 ftell
+ftruncate
+futex
 fwrite
+gcc
+gdb
+getaffinity
 getc
 getchar
+getcwd
+getdents
 getenv
+getgid
+getitimer
+getopt
+getparam
+getpid
+getpriority
+getrandom
+getrlimit
+getrusage
 gets
+getscheduler
+getsockopt
+gettime
+gettimeofday
+getuid
+git
+github
+glibc
+gprof
+hotfix
+http
+https
+hv
+ih
+info
+init
+inotify
+ioctl
+ioperm
+ioprio
 isalnum
 isalpha
 isascii
@@ -103,349 +163,287 @@ isprint
 ispunct
 isspace
 isupper
+it
+kexec
+lchown
+ld
+leetcode
+LeetCode
+lf
+lhs
+lib
+libvirt
+lifo
+lima
+linenoise
+linux
+lld
+lldb
+llu
+llx
+llX
 longjmp
+lseek
+lu
+lx
+lX
+macOS
+madvise
+malloc
+massif
 memchr
 memcmp
 memcpy
 memmove
 memset
-printf
-putc
-putchar
-putenv
-puts
-qsort
-rand
-realloc
-regcomp
-regerror
-regexec
-regfree
-rewind
-scanf
-setbuf
-setjmp
-signal
-srand
-sscanf
-macOS
-Arm
-cpu
-linenoise
-vim
-lldb
-utf
-unicode
-checksum
-sha
-shasum
-verifier
-CI
-foreach
-backtick
-leetcode
-LeetCode
-perf
-gprof
-typeof
-offsetof
-rbtree
-vfprintf
-vla
-ctrl
-randombyte
-randombit
-ioctl
-syscall
-syscalls
-getrandom
-urandom
-arch
-aarch
-risc
-riscv
-lseek
-mmap
-mprotect
-munmap
-brk
-pread
-pwrite
-readv
-writev
-sched
-msync
 mincore
-madvise
-shmget
-shmat
-shmctl
-dup
-nanosleep
-getitimer
-setitimer
-getpid
-sendfile
-sendto
-recvfrom
-sendmsg
-recvmsg
-socketpair
-setsockopt
-getsockopt
-fcntl
-flock
-fsync
-fdatasync
-ftruncate
-getdents
-getcwd
-chdir
-fchdir
+mips
 mkdir
-rmdir
-creat
-unlink
-symlink
-readlink
-chmod
-fchmod
-chown
-fchown
-lchown
-umask
-gettimeofday
-getrlimit
-getrusage
-sysinfo
-ptrace
-getuid
-syslog
-getgid
-setuid
-setgid
-capget
-capset
-sigaltstack
-utime
 mknod
-ustat
-stat
-getopt
-statfs
-fstatfs
-sysfs
-getpriority
-setpriority
-setparam
-getparam
-setscheduler
-getscheduler
 mlock
-munlock
 mlockall
-munlockall
-sysctl
-prctl
-adjtimex
-setrlimit
-chroot
-sync
-acct
-settimeofday
-umount
-swapon
-swapoff
-sethostname
-setdomainname
-ioperm
-readahead
-futex
-setaffinity
-getaffinity
-epoll
-fadvise
-settime
-gettime
-tgkill
+mmap
+mprotect
 mq
-kexec
-ioprio
-inotify
-openat
-splice
-signalfd
-timerfd
-eventfd
-preadv
-pwritev
-recvmmsg
-seccomp
-userfaultfd
-compat
-reverseK
-rt
-rr
-sigaction
-sigprocmask
-alloc
-adjtime
-perf
-uring
-Shannon
-http
-https
-tcp
-awk
-sed
-changeid
-en
+mrs
 msg
-cjk
-massif
-csapp
-cmu
-ele
-lima
-github
-ih
-it
-spawnp
-AddressSanitizer
-asan
-dbg
-dev
-sys
-proc
-dpkg
-apt
-siglongjmp
-sigsetjmp
-SIGABRT
-SIGALRM
-SIGBUS
-SIGFPE
-SIGHUP
-SIGILL
-SIGINT
-SIGKILL
-SIGPIPE
-SIGQUIT
-SIGSEGV
-SIGTERM
-SIGTRAP
-SIGUSR
-SIGWINCH
-risc
-mips
-riscv
-info
-cpu
-libvirt
-preprocessor
-sizeof
-alignas
-alignof
-constexpr
-enum
-char
-nullptr
-typedef
-BitInt
+msync
+munlock
+munlockall
+munmap
+nanosleep
+newline
 noreturn
-pragma
-EditorConfig
-abcdefghijklmnopqrstuvwxyz
-cmd
-commitlog
-cpp
-crit
-dereference
-dereferenced
-dict
-errno
-fmt
-fmtscan
-init
-lX
-ld
-lf
-llX
-lld
-llu
-llx
-lx
-malloc
+nullptr
+offsetof
+oneline
+openat
+param
+pbl
+pC
 pCn
 pCr
+pE
 pEc
 pEh
 pEo
+perf
 pEs
+pf
 pF
+pg
 pGg
+pGp
 pGv
+phC
+phD
+phN
+piSb
 pISb
+piSc
 pISc
+piSf
 pISf
+piSh
 pISh
+piSl
 pISl
+piSn
 pISn
+piSpc
 pISpc
 pK
+pm
+pM
 pMF
+pmR
 pMR
 pNF
+posix
+pr
+pragma
+prctl
+pre
+pread
+preadv
+preprocessor
+printf
+proc
+ps
+pS
 pSR
-pUL
+ptrace
 pUl
+pUL
+putc
+putchar
+putenv
+puts
 pV
-param
-pbl
-pf
-phC
-phN
-piSb
-piSc
-piSf
-piSh
-piSl
-piSn
-piSpc
-pmR
-posix
+pwrite
+pwritev
+pws
+qsort
+qtest
+rand
+randombit
+randombyte
+rbtree
 rdtsc
-cntvct
-mrs
-arg
-args
+readahead
+readlink
+readv
+realloc
+recvfrom
+recvmmsg
+recvmsg
+regcomp
+regerror
+regexec
+regfree
+retpoline
+reverseK
+rewind
+rhs
+risc
+riscv
+rmdir
+rr
+rt
+runtime
+sanitizer
+sbin
+scanf
+sched
+sdk
+seccomp
+sed
+sendfile
+sendmsg
+sendto
+setaffinity
+setbuf
+setdomainname
+setgid
+sethostname
+setitimer
+setjmp
+setparam
+setpriority
+setrlimit
+setscheduler
+setsockopt
+settime
+settimeofday
+setuid
+sha
+Shannon
+shasum
+shmat
+shmctl
+shmget
+SIGABRT
+sigaction
+SIGALRM
+sigaltstack
+SIGBUS
+SIGFPE
+SIGHUP
+SIGILL
+SIGINT
+SIGKILL
+siglongjmp
+signal
+signalfd
+SIGPIPE
+sigprocmask
+SIGQUIT
+SIGSEGV
+sigsetjmp
+SIGTERM
+SIGTRAP
+SIGUSR
+SIGWINCH
+sizeof
+snprintf
+socketpair
+spawnp
+splice
+sprintf
+srand
+sscanf
+stat
+statfs
+stderr
+stdin
+stdout
+str
+strcasecmp
+strcat
+strchr
+strcmp
+strcoll
+strcpy
+strcspn
+strdup
+strerror
+strlen
+strncasecmp
+strncat
+strncmp
+strncpy
+strpbrk
+strrchr
+strspn
+strstr
+strtod
+strtof
+strtok
+strtol
+strtold
+strtoul
+swapoff
+swapon
+symlink
+sync
+sys
+syscall
+syscalls
+sysctl
+sysfs
+sysinfo
+syslog
 tau
+tcp
+tgkill
+timerfd
+todo
+typedef
+typeof
+ubuntu
+umask
+umount
 unallocated
+unicode
+unix
+unlink
 unsorted
+urandom
+uring
+userfaultfd
+usr
+ustat
+utf
+utime
+valgrind
+var
+verifier
+vfprintf
+vim
+vla
+vscode
 waitpid
 workspace
+writev
 zd
 zu
-oneline
-str
-pws
-el
-fd
-hv
-col
-dA
-dC
-dD
-lu
-pC
-pE
-pGp
-pM
-pS
-pg
-phD
-pm
-pr
-ps
-newline
-abbrev
diff --git a/scripts/pre-commit.hook b/scripts/pre-commit.hook
index bae4cb5ef..244f93fab 100755
--- a/scripts/pre-commit.hook
+++ b/scripts/pre-commit.hook
@@ -222,6 +222,14 @@ if [ "${#SHELL_FILES[@]}" -gt 0 ]; then
   done
 fi
 
+ASPELL_DICT_FILE='scripts/aspell-pws'
+if ! tail -n +2 $ASPELL_DICT_FILE | sort -cdu; then
+  throw '%s\n%s\n%s' \
+    'Aspell dictionary is unsorted or contains duplicated entries.' \
+    'Make sure that by using:' \
+    "    tail -n +2 $ASPELL_DICT_FILE | sort -du"
+fi
+
 # Show insertion and deletion counts.
 if [ "${#FILES[@]}" -gt 0 ]; then
   echo "Following files were changed:"