diff --git a/Makefile b/Makefile
index 0ce6f3ee..c4a23ae8 100644
--- a/Makefile
+++ b/Makefile
@@ -126,16 +126,13 @@ lexgen:
 
 .PHONY: lexgen-types
 lexgen-types:
-	rm -rf ../atproto \
-	&& git clone git@github.com:bluesky-social/atproto \
-	&& mv atproto ../
 	go run github.com/bluesky-social/indigo/cmd/lexgen --package streamplace \
 		--types-import place.stream:stream.place/streamplace/pkg/streamplace \
 		-outdir ./pkg/streamplace \
 		--prefix place.stream \
 		--build-file util/lexgen-types.json \
 		lexicons/place/stream \
-		../atproto/lexicons
+		./subprojects/atproto/lexicons
 
 .PHONY: lexgen-server
 lexgen-server:
diff --git a/meson.build b/meson.build
index b2412dd4..52c73ee0 100644
--- a/meson.build
+++ b/meson.build
@@ -196,6 +196,11 @@ streamplace_deps += [
   dependency('gstreamer-pbutils-1.0'),
 ]
 
+atproto = subproject(
+  'atproto',
+  default_options: {},
+)
+
 if get_option('default_library') == 'static'
   gst_full_dep = gstreamer_proj.get_variable('gst_full_dep')
   streamplace_deps += [
@@ -296,4 +301,4 @@ else
     install_dir: './bin',
     build_by_default: false,
   )
-endif
\ No newline at end of file
+endif
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index b5e1424d..d12038c5 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -4,3 +4,4 @@
 !FFmpeg.wrap
 !c2pa_go.wrap
 !gstreamer-full.wrap
+!atproto.wrap
diff --git a/subprojects/atproto.wrap b/subprojects/atproto.wrap
new file mode 100644
index 00000000..f74e505f
--- /dev/null
+++ b/subprojects/atproto.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+url = https://github.com/bluesky-social/atproto.git
+revision = fb283edbaf8aa3ecc7db014a40a28173ce81bc4c
+depth = 1
+patch_directory = atproto