diff --git a/src/drivers/bmp280/CMakeLists.txt b/src/drivers/bmp280/CMakeLists.txt
index 210c4d1e63..1199aa1d75 100644
--- a/src/drivers/bmp280/CMakeLists.txt
+++ b/src/drivers/bmp280/CMakeLists.txt
@@ -1,6 +1,6 @@
 ############################################################################
 #
-#   Copyright (c) 2015 PX4 Development Team. All rights reserved.
+#   Copyright (c) 2016 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -30,23 +30,16 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-set(srcs
-    bmp280_spi.cpp
-   )
 
-if ($ {OS} STREQUAL "nuttx")
-	list(APPEND srcs
-	     bmp280.cpp
-	    )
-	endif()
-
-	px4_add_module(
-		MODULE drivers__bmp280
-		MAIN bmp280
-		COMPILE_FLAGS
-		- Os
-		SRCS $ {srcs}
-		DEPENDS
+px4_add_module(
+	MODULE drivers__bmp280
+	MAIN bmp280
+	COMPILE_FLAGS
+		-Os
+	SRCS
+		bmp280_spi.cpp
+		bmp280.cpp
+	DEPENDS
 		platforms__common
 	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
+# vim: set noet ft=cmake fenc=utf-8 ff=unix : 
diff --git a/src/drivers/bmp280/bmp280.cpp b/src/drivers/bmp280/bmp280.cpp
index 0762e9885c..6c7af54d5a 100644
--- a/src/drivers/bmp280/bmp280.cpp
+++ b/src/drivers/bmp280/bmp280.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2012-2015 PX4 Development Team. All rights reserved.
+ *   Copyright (c) 2012-2016 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/drivers/bmp280/bmp280.h b/src/drivers/bmp280/bmp280.h
index 1b5b43db0b..a2399bf395 100644
--- a/src/drivers/bmp280/bmp280.h
+++ b/src/drivers/bmp280/bmp280.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (C) 2012-2013 PX4 Development Team. All rights reserved.
+ *   Copyright (C) 2012-2016 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/drivers/bmp280/bmp280_spi.cpp b/src/drivers/bmp280/bmp280_spi.cpp
index 406a5d8a8c..a5b2b08d01 100644
--- a/src/drivers/bmp280/bmp280_spi.cpp
+++ b/src/drivers/bmp280/bmp280_spi.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2013 PX4 Development Team. All rights reserved.
+ *   Copyright (c) 2016 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions