diff --git a/Makefile b/Makefile
index dfc2ece..5114057 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,9 @@ CPPFLAGS = -I include/afp/
 
 OBJS = o/finder_info.o o/resource_fork.o
 
-# also cygwin...
-ifeq ($(MSYSTEM),MSYS)
+ifeq ($(OS),Windows_NT)
 	OBJS += o/remap_os_error.o
-endif
-
-ifneq ($(OS),Windows_NT)
+else
 	OBJS += o/xattr.o
 endif
 
@@ -32,4 +29,5 @@ o/%.o: src/%.c | o
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 o/%.o: src/%.cpp | o
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
\ No newline at end of file
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+