2 files changed, 8 insertions, 10 deletions
diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt
index 712836a531..1eb3546d68 100644
--- a/Userland/Utilities/CMakeLists.txt
+++ b/Userland/Utilities/CMakeLists.txt
@@ -54,6 +54,7 @@ endforeach()
 target_link_libraries(aplay LibAudio)
 target_link_libraries(arp LibMain)
 target_link_libraries(asctl LibAudio)
+target_link_libraries(base64 LibMain)
 target_link_libraries(bt LibSymbolication)
 target_link_libraries(checksum LibCrypto)
 target_link_libraries(chres LibGUI)
diff --git a/Userland/Utilities/base64.cpp b/Userland/Utilities/base64.cpp
index e08e025509..190eb6558e 100644
--- a/Userland/Utilities/base64.cpp
+++ b/Userland/Utilities/base64.cpp
@@ -9,16 +9,15 @@
 #include <AK/ByteBuffer.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/File.h>
+#include <LibCore/System.h>
+#include <LibMain/Main.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-int main(int argc, char** argv)
+ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
-    if (pledge("stdio rpath", nullptr) < 0) {
-        perror("pledge");
-        return 1;
-    }
+    TRY(Core::System::pledge("stdio rpath", nullptr));
 
     bool decode = false;
     const char* filepath = nullptr;
@@ -26,7 +25,7 @@ int main(int argc, char** argv)
     Core::ArgsParser args_parser;
     args_parser.add_option(decode, "Decode data", "decode", 'd');
     args_parser.add_positional_argument(filepath, "", "file", Core::ArgsParser::Required::No);
-    args_parser.parse(argc, argv);
+    args_parser.parse(arguments);
 
     ByteBuffer buffer;
     if (filepath == nullptr || strcmp(filepath, "-") == 0) {
@@ -44,10 +43,7 @@ int main(int argc, char** argv)
         buffer = file->read_all();
     }
 
-    if (pledge("stdio", nullptr) < 0) {
-        perror("pledge");
-        return 1;
-    }
+    TRY(Core::System::pledge("stdio", nullptr));
 
     if (decode) {
         auto decoded = decode_base64(StringView(buffer));
@@ -61,4 +57,5 @@ int main(int argc, char** argv)
 
     auto encoded = encode_base64(buffer);
     outln("{}", encoded);
+    return 0;
 }