diff --git a/opencv-samples-Makefile b/opencv-samples-Makefile
index 6c69149..bd4dc6d 100644
--- a/opencv-samples-Makefile
+++ b/opencv-samples-Makefile
@@ -1,4 +1,10 @@
 CFLAGS := `pkg-config --cflags opencv` $(CFLAGS)
+CXXFLAGS := `pkg-config --cflags opencv` $(CXXFLAGS)
 LDFLAGS := `pkg-config --libs opencv` $(LDFLAGS)
 
-all: $(patsubst %.c,%,$(wildcard *.c))
+PROGRAMS := $(patsubst %.c,%,$(wildcard *.c)) $(patsubst %.cpp,%,$(wildcard *.cpp))
+
+.PHONY: all clean
+all: $(PROGRAMS)
+clean:
+	rm -f $(PROGRAMS)
diff --git a/opencv.spec b/opencv.spec
index d0f2485..51a9e0e 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -4,7 +4,7 @@
 
 Name:           opencv
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 09 2010 Rakesh Pandit <rakesh@fedoraproject.org> - 2.0.0-4
+- Updated opencv-samples-Makefile (Thanks Scott Tsai) #553697
+
 * Wed Jan 06 2010 Karel Klic <kklic@redhat.com> - 2.0.0-3
 - Fixed spec file issues detected by rpmlint