diff --git a/bp.sh b/bp.sh
index 59068d8..7612326 100755
--- a/bp.sh
+++ b/bp.sh
@@ -5,5 +5,5 @@ GPG_ARGS="$([ ! -z "$BROWNPAPER_KEY" ] && echo "--local-user $BROWNPAPER_KEY")"
 if [ ! -z "$1" ]; then
 	printf "$1" | gpg --sign -a $GPG_ARGS | curl -s --data @-  -X POST $BP_ENDPOINT/new -Ls $CURL_ARGS
 else
-	gpg --sign -a $GPG_ARGS | curl -s --data @-  -X POST $BROWNPAPER_ENDPOINT/new -Ls $CURL_ARGS
+	gpg --sign -a $GPG_ARGS | curl -s --data @-  -X POST $BP_ENDPOINT/new -Ls $CURL_ARGS
 fi
diff --git a/default.nix b/default.nix
index 8963d6e..5614d0e 100644
--- a/default.nix
+++ b/default.nix
@@ -5,7 +5,7 @@
 , src ? (builtins.filterSource (path: type: baseNameOf path != "target") ./.)
 }:
 let
-  crate2nix_tools = import "${builtins.fetchTarball { url = "https://github.com/kolloch/crate2nix/archive/0.8.0.tar.gz"; sha256 = "17mmf5sqn0fmpqrf52icq92nf1sy5yacwx9vafk43piaq433ba56"; }}/tools.nix" { };
+  crate2nix_tools = import "${builtins.fetchTarball { url = "https://github.com/kolloch/crate2nix/archive/0.8.0.tar.gz"; sha256 = "17mmf5sqn0fmpqrf52icq92nf1sy5yacwx9vafk43piaq433ba56"; }}/tools.nix" { inherit pkgs; };
   overrides = pkgs.defaultCrateOverrides // rec {
     nettle-sys = attrs: with pkgs; {
       nativeBuildInputs = [ clang nettle pkg-config ];
@@ -17,4 +17,8 @@ let
     };
     brownpaper = sequoia-openpgp; # requires gmp as well
   };
-in callPackage (crate2nix_tools.generatedCargoNix { inherit name src; }) { inherit pkgs stdenv; defaultCrateOverrides = overrides; } 
+  client = pkgs.writeShellScript "brownpaper" ''
+    PATH=$PATH:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/ ${./bp.sh} $@
+  '';
+in
+{ server = (crate2nix_tools.generatedCargoNix { inherit name src; });  inherit client; }