diff --git a/CHANGELOG.md b/CHANGELOG.md
index 863e5d35..28987aff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## 2021.1 (18)
+Polls! They're finally here. There will likely be another build in the next several weeks to polish some things off before WWDC, so if you've encountered any issues, now's the time to let me know :)
+
+Features/Improvements:
+- Show polls on posts
+- Add authoring polls to Compose screen
+- Add poll completed notifications
+- Add preference for requiring confirmation before reblogging
+
+Bugfixes:
+- Fix cursor movement not working in Compse text field when an emoji was entered
+- Fix several crashes related to network requests failing
+- Show assets in attachment picker immediately after permissions is initially granted
+- Fix crash when tapping non-HTTP(S) link with the In-App Safari preference enabled
+
+Known Issues:
+- Polls with between 23h30m and 24h left show as "0 weeks remaining"
+
 ## 2021.1 (17)
 The main improvement this build is a complete overhaul of the Conversation screen, along with fixes for a few different crashes.
 
diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj
index bd5b9bf0..9df85ca0 100644
--- a/Tusker.xcodeproj/project.pbxproj
+++ b/Tusker.xcodeproj/project.pbxproj
@@ -2445,7 +2445,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -2474,7 +2474,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
diff --git a/Tusker/Info.plist b/Tusker/Info.plist
index d07fd5e5..5e034cbb 100644
--- a/Tusker/Info.plist
+++ b/Tusker/Info.plist
@@ -2,11 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>gopher</string>
-		<string>gemini</string>
-	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -38,6 +33,11 @@
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>gopher</string>
+		<string>gemini</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -56,7 +56,7 @@
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Post videos from the camera.</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>Save photos directly from other people&apos;s posts.</string>
+	<string>Save photos directly from other people's posts.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Post photos from the photo library.</string>
 	<key>NSUserActivityTypes</key>