diff --git a/Makefile b/Makefile
index 5ac383a..e4a6f3e 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ srcs = \
 	src/executing/here_doc/random_filename.c \
 	src/executing/here_doc/strip_newline.c \
 	src/executing/simple_cmd/builtin_cd.c \
+	src/executing/simple_cmd/builtin_exit.c \
 	src/executing/simple_cmd/builtin_export.c \
 	src/executing/simple_cmd/builtin_invalid.c \
 	src/executing/simple_cmd/builtin_pwd.c \
diff --git a/src/executing/simple_cmd/builtin_exit.c b/src/executing/simple_cmd/builtin_exit.c
new file mode 100644
index 0000000..e164a38
--- /dev/null
+++ b/src/executing/simple_cmd/builtin_exit.c
@@ -0,0 +1,27 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   builtin_exit.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: khais <marvin@42.fr>                       +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2025/04/01 18:17:56 by khais             #+#    #+#             */
+/*   Updated: 2025/04/02 15:06:22 by khais            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "builtins.h"
+#include <stdlib.h>
+#include "libft.h"
+
+t_builtin_type	builtin_exit(t_simple_cmd *cmd, t_minishell *app)
+{
+	int	status;
+
+	status = 0;
+	if (cmd->words->next != NULL)
+		status = ft_atoi(cmd->words->next->word->word);
+	simple_cmd_destroy(cmd);
+	env_destroy(app->env);
+	exit(status);
+}
diff --git a/src/executing/simple_cmd/builtins.c b/src/executing/simple_cmd/builtins.c
index 4f8a3fa..c166c44 100644
--- a/src/executing/simple_cmd/builtins.c
+++ b/src/executing/simple_cmd/builtins.c
@@ -6,7 +6,7 @@
 /*   By: khais <marvin@42.fr>                       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/04/01 16:37:21 by khais             #+#    #+#             */
-/*   Updated: 2025/04/01 16:37:38 by khais            ###   ########.fr       */
+/*   Updated: 2025/04/01 18:17:25 by khais            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,6 +24,8 @@ t_builtin_type	get_builtin(t_simple_cmd *cmd)
 		return (BUILTIN_CD);
 	if (ft_strcmp("export", word) == 0)
 		return (BUILTIN_EXPORT);
+	if (ft_strcmp("exit", word) == 0)
+		return (BUILTIN_EXIT);
 	return (BUILTIN_INVALID);
 }
 
@@ -35,6 +37,7 @@ t_builtin_type	execute_builtin(t_simple_cmd *cmd, t_minishell *app)
 	[BUILTIN_PWD] = builtin_pwd,
 	[BUILTIN_CD] = builtin_cd,
 	[BUILTIN_EXPORT] = builtin_export,
+	[BUILTIN_EXIT] = builtin_exit,
 	};
 
 	type = get_builtin(cmd);
diff --git a/src/executing/simple_cmd/builtins.h b/src/executing/simple_cmd/builtins.h
index dd4011d..6a4b34d 100644
--- a/src/executing/simple_cmd/builtins.h
+++ b/src/executing/simple_cmd/builtins.h
@@ -6,7 +6,7 @@
 /*   By: khais <marvin@42.fr>                       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/03/31 14:16:13 by khais             #+#    #+#             */
-/*   Updated: 2025/04/01 16:37:15 by khais            ###   ########.fr       */
+/*   Updated: 2025/04/01 18:17:50 by khais            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,6 +19,7 @@ t_builtin_type	builtin_invalid(t_simple_cmd *cmd, t_minishell *app);
 t_builtin_type	builtin_pwd(t_simple_cmd *cmd, t_minishell *app);
 t_builtin_type	builtin_cd(t_simple_cmd *cmd, t_minishell *app);
 t_builtin_type	builtin_export(t_simple_cmd *cmd, t_minishell *app);
+t_builtin_type	builtin_exit(t_simple_cmd *cmd, t_minishell *app);
 
 t_builtin_type	get_builtin(t_simple_cmd *cmd);
 t_builtin_type	execute_builtin(t_simple_cmd *cmd, t_minishell *app);
diff --git a/src/executing/simple_cmd/simple_cmd_execute.c b/src/executing/simple_cmd/simple_cmd_execute.c
index ad6d5f0..d93f5e1 100644
--- a/src/executing/simple_cmd/simple_cmd_execute.c
+++ b/src/executing/simple_cmd/simple_cmd_execute.c
@@ -6,7 +6,7 @@
 /*   By: khais <marvin@42.fr>                       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/03/27 16:21:56 by khais             #+#    #+#             */
-/*   Updated: 2025/04/02 18:45:47 by khais            ###   ########.fr       */
+/*   Updated: 2025/04/02 19:15:08 by khais            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,7 +19,7 @@
 #include <sys/wait.h>
 #include <stdio.h>
 #include <stdlib.h>
- 
+
 static void	command_not_found(t_simple_cmd *cmd)
 {
 	ft_dprintf(STDERR_FILENO, "minishell: %s: command not found\n",
diff --git a/src/executing/simple_cmd/simple_cmd_execute.h b/src/executing/simple_cmd/simple_cmd_execute.h
index 43d306a..b043b0b 100644
--- a/src/executing/simple_cmd/simple_cmd_execute.h
+++ b/src/executing/simple_cmd/simple_cmd_execute.h
@@ -6,7 +6,7 @@
 /*   By: khais <marvin@42.fr>                       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/03/27 16:20:31 by khais             #+#    #+#             */
-/*   Updated: 2025/04/01 13:54:10 by khais            ###   ########.fr       */
+/*   Updated: 2025/04/01 18:17:33 by khais            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,6 +24,7 @@ typedef enum e_builtin_type
 	BUILTIN_PWD,
 	BUILTIN_CD,
 	BUILTIN_EXPORT,
+	BUILTIN_EXIT,
 }	t_builtin_type;
 
 #endif // SIMPLE_CMD_EXECUTE_H
diff --git a/test.sh b/test.sh
index 18e4bf6..8061ec0 100755
--- a/test.sh
+++ b/test.sh
@@ -357,6 +357,24 @@ hi
 0
 EOF
 
+when_run <<EOF "exit works"
+$MINISHELL
+exit
+echo \$?
+EOF
+expecting <<EOF
+0
+EOF
+
+when_run <<EOF "exit works with custom exit code"
+$MINISHELL
+exit 99
+echo \$?
+EOF
+expecting <<EOF
+99
+EOF
+
 when_run <<EOF "quoted parentheses are not operators"
 echo unclosed '('
 EOF