diff --git a/CHANGELOG b/CHANGELOG
index ff28f59095..699331bfc3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+git-annex (10.20230330) UNRELEASED; urgency=medium
+
+  * git-annex.cabal: Prevent building with unix-compat 0.7 which
+    removed System.PosixCompat.User.
+
+ -- Joey Hess <id@joeyh.name>  Fri, 31 Mar 2023 12:48:54 -0400
+
 git-annex (10.20230329) upstream; urgency=medium
 
   * sync: Fix parsing of gcrypt::rsync:// urls that use a relative path.
diff --git a/doc/bugs/System.PosixCompat.User_removed_in_unix-compat-0.7.mdwn b/doc/bugs/System.PosixCompat.User_removed_in_unix-compat-0.7.mdwn
index 3aa6182037..542be432e0 100644
--- a/doc/bugs/System.PosixCompat.User_removed_in_unix-compat-0.7.mdwn
+++ b/doc/bugs/System.PosixCompat.User_removed_in_unix-compat-0.7.mdwn
@@ -56,3 +56,5 @@ Sorry, I'm not a git-annex user. I'm a maintainer of the Homebrew package
 manager, and I help to make the newest git-annex available to our users.
 
 Thanks for all your work maintaining git-annex!
+
+> [[fixed|done]] by avoiding the broken version --[[Joey]]
diff --git a/doc/bugs/System.PosixCompat.User_removed_in_unix-compat-0.7/comment_1_cd573b785b7d7feec72387cb0dafdcab._comment b/doc/bugs/System.PosixCompat.User_removed_in_unix-compat-0.7/comment_1_cd573b785b7d7feec72387cb0dafdcab._comment
new file mode 100644
index 0000000000..9894d24ea6
--- /dev/null
+++ b/doc/bugs/System.PosixCompat.User_removed_in_unix-compat-0.7/comment_1_cd573b785b7d7feec72387cb0dafdcab._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2023-03-31T16:50:28Z"
+ content="""
+Unfortunately pinning to 0.6 is the only solution, I cannot work around
+this ill-considered change in git-annex. I have opened an issue and hope
+the maintainers reconsider.
+<https://github.com/haskell-pkg-janitors/unix-compat/issues/3>
+"""]]
diff --git a/git-annex.cabal b/git-annex.cabal
index 65f10351cd..365d19ce42 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -294,7 +294,7 @@ source-repository head
   location: git://git-annex.branchable.com/
 
 custom-setup
-  Setup-Depends: base (>= 4.11.1.0 && < 5.0), split, unix-compat, 
+  Setup-Depends: base (>= 4.11.1.0 && < 5.0), split, unix-compat (< 0.7), 
     filepath, exceptions, bytestring, IfElse, data-default,
     filepath-bytestring (>= 1.4.2.1.4),
     process (>= 1.6.3),
@@ -318,7 +318,7 @@ Executable git-annex
    case-insensitive,
    random,
    dlist,
-   unix-compat (>= 0.5),
+   unix-compat (>= 0.5 && < 0.7),
    SafeSemaphore,
    async,
    directory (>= 1.2.7.0),