diff --git a/.gitignore b/.gitignore
index ccd71601..c86d6d07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ NT/elogd.opensdf
 vc110.idb
 elog*.exe
 NT/x64/Debug/
+build
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..53fa2aaa
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,39 @@
+# CMakeLists.txt for ELOG project
+project(ELOG)
+cmake_minimum_required(VERSION 2.8)
+
+# compile options
+option(USE_SSL "Use OpenSSL library for https" OFF)
+
+include_directories(${CMAKE_SOURCE_DIR}/mxml)
+
+# default compiler flags
+add_compile_options(-Wall -Wno-deprecated-declarations)
+
+# disable warnings for regex.c
+set_source_files_properties(${CMAKE_SOURCE_DIR}/src/regex.c PROPERTIES COMPILE_FLAGS -w)
+
+# optional SSL stuff
+if (USE_SSL)
+  add_compile_definitions(HAVE_SSL)
+  find_package(OPENSSL REQUIRED)
+  include_directories(${OPENSSL_INCLUDE_DIR})
+endif (USE_SSL)
+
+add_executable(elogd 
+  ${CMAKE_SOURCE_DIR}/src/elogd.c
+  ${CMAKE_SOURCE_DIR}/src/auth.c
+  ${CMAKE_SOURCE_DIR}/mxml/mxml.c
+  ${CMAKE_SOURCE_DIR}/src/crypt.c
+  ${CMAKE_SOURCE_DIR}/src/regex.c
+)
+
+add_executable(elog
+  ${CMAKE_SOURCE_DIR}/src/elog.c
+  ${CMAKE_SOURCE_DIR}/src/crypt.c
+)
+
+target_link_libraries(elogd ${OPENSSL_LIBRARIES})
+target_link_libraries(elog ${OPENSSL_LIBRARIES})
+
+
diff --git a/build b/buildrpm
similarity index 100%
rename from build
rename to buildrpm