diff --git a/Makefile b/Makefile
index c1a6079..6a3cf0a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: tmaze <marvin@42.fr>                       +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2018/04/04 10:51:59 by tmaze             #+#    #+#              #
-#    Updated: 2018/04/04 11:34:29 by tmaze            ###   ########.fr        #
+#    Updated: 2018/04/04 11:53:57 by tmaze            ###   ########.fr        #
 #                                                                              #
 #******************************************************************************#
 
@@ -17,7 +17,8 @@ CCSTD = -std=c99
 NAME = libft.a
 
 SRCS =	ft_isalpha.c \
-		ft_isdigit.c
+		ft_isdigit.c \
+		ft_isalnum.c
 OBJS = $(SRCS:.c=.o)
 INCLS = -I.
 
diff --git a/ft_isalnum.c b/ft_isalnum.c
new file mode 100644
index 0000000..2d1d9c5
--- /dev/null
+++ b/ft_isalnum.c
@@ -0,0 +1,18 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_isalnum.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <marvin@42.fr>                       +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2018/04/04 11:51:53 by tmaze             #+#    #+#             */
+/*   Updated: 2018/04/04 12:00:08 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+int	ft_isalnum(int c)
+{
+	return (ft_isalpha(c) || ft_isdigit(c));
+}